Merge branch 'master' into fix-shared-links

720 files changed, 19181 insertions, 8151 deletions

diff --git a/.gitignore b/.gitignore
index 09af6808d64..40d6e6ca0fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,6 +56,7 @@ nbproject
 
 # Cloud9IDE
 .settings.xml
+.c9revisions
 
 # vim ex mode
 .vimrc
diff --git a/apps/files/ajax/move.php b/apps/files/ajax/move.php
index 78ed218c136..93063e52eb0 100644
--- a/apps/files/ajax/move.php
+++ b/apps/files/ajax/move.php
@@ -11,8 +11,10 @@ $dir = stripslashes($_POST["dir"]);
 $file = stripslashes($_POST["file"]);
 $target = stripslashes(rawurldecode($_POST["target"]));
 
+$l = OC_L10N::get('files');
+
 if(\OC\Files\Filesystem::file_exists($target . '/' . $file)) {
-	OCP\JSON::error(array("data" => array( "message" => "Could not move $file - File with this name already exists" )));
+	OCP\JSON::error(array("data" => array( "message" => $l->t("Could not move %s - File with this name already exists", array($file)) )));
 	exit;
 }
 
@@ -22,8 +24,8 @@ if ($dir != '' || $file != 'Shared') {
 	if(\OC\Files\Filesystem::rename($sourceFile, $targetFile)) {
 		OCP\JSON::success(array("data" => array( "dir" => $dir, "files" => $file )));
 	} else {
-		OCP\JSON::error(array("data" => array( "message" => "Could not move $file" )));
+		OCP\JSON::error(array("data" => array( "message" => $l->t("Could not move %s", array($file)) )));
 	}
 }else{
-	OCP\JSON::error(array("data" => array( "message" => "Could not move $file" )));
+	OCP\JSON::error(array("data" => array( "message" => $l->t("Could not move %s", array($file)) )));
 }
diff --git a/apps/files/ajax/rename.php b/apps/files/ajax/rename.php
index 970aaa638da..9fd2ce3ad4b 100644
--- a/apps/files/ajax/rename.php
+++ b/apps/files/ajax/rename.php
@@ -11,14 +11,16 @@ $dir = stripslashes($_GET["dir"]);
 $file = stripslashes($_GET["file"]);
 $newname = stripslashes($_GET["newname"]);
 
+$l = OC_L10N::get('files');
+
 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" => "Unable to rename file" )));
+		OCP\JSON::error(array("data" => array( "message" => $l->t("Unable to rename file") )));
 	}
 }else{
-	OCP\JSON::error(array("data" => array( "message" => "Unable to rename file" )));
+	OCP\JSON::error(array("data" => array( "message" => $l->t("Unable to rename file") )));
 }
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 676612c0e42..07977f5ddf1 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -49,7 +49,7 @@ foreach ($files['size'] as $size) {
 	$totalSize += $size;
 }
 if ($totalSize > \OC\Files\Filesystem::free_space($dir)) {
-	OCP\JSON::error(array('data' => array('message' => $l->t('Not enough space available'),
+	OCP\JSON::error(array('data' => array('message' => $l->t('Not enough storage available'),
 		'uploadMaxFilesize' => $maxUploadFilesize,
 		'maxHumanFilesize' => $maxHumanFilesize)));
 	exit();
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index f37ac4c262a..67bd569ceef 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -3,7 +3,7 @@
  See the COPYING-README file. */
 
 /* FILE MENU */
-.actions { padding:.3em; float:left; height:2em; width: 100%; }
+.actions { padding:.3em; height:2em; width: 100%; }
 .actions input, .actions button, .actions .button { margin:0; float:left; }
 
 #new {
diff --git a/apps/files/index.php b/apps/files/index.php
index 104cf1a55d3..434e98c6ea8 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -92,7 +92,7 @@ foreach (explode('/', $dir) as $i) {
 $list = new OCP\Template('files', 'part.list', '');
 $list->assign('files', $files, false);
 $list->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=', false);
-$list->assign('downloadURL', OCP\Util::linkTo('files', 'download.php') . '?file=', false);
+$list->assign('downloadURL', OCP\Util::linkToRoute('download', array('file' => '/')), false);
 $list->assign('disableSharing', false);
 $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
 $breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index c30f1bcddd8..e1d8b60d315 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -112,9 +112,8 @@ var FileActions = {
 			if (img.call) {
 				img = img(file);
 			}
-			// NOTE: Temporary fix to allow unsharing of files in root of Shared folder
-			if ($('#dir').val() == '/Shared') {
-				var html = '<a href="#" original-title="' + t('files', 'Unshare') + '" class="action delete" />';
+			if  (typeof trashBinApp !== 'undefined' && trashBinApp) {
+				var html = '<a href="#" original-title="' + t('files', 'Delete permanently') + '" class="action delete" />';
 			} else {
 				var html = '<a href="#" original-title="' + t('files', 'Delete') + '" class="action delete" />';
 			}
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 72b353b48c2..cc107656da8 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -3,35 +3,92 @@ var FileList={
 	update:function(fileListHtml) {
 		$('#fileList').empty().html(fileListHtml);
 	},
-	addFile:function(name,size,lastModified,loading,hidden){
-		var basename, extension, simpleSize, sizeColor, lastModifiedTime, modifiedColor,
-			img=(loading)?OC.imagePath('core', 'loading.gif'):OC.imagePath('core', 'filetypes/file.png'),
-			html='<tr data-type="file" data-size="'+size+'" data-permissions="'+$('#permissions').val()+'">';
-		if(name.indexOf('.')!=-1){
+	createRow:function(type, name, iconurl, linktarget, size, lastModified, permissions){
+		var td, simpleSize, basename, extension;
+		//containing tr
+		var tr = $('<tr></tr>').attr({
+			"data-type": type,
+			"data-size": size,
+			"data-file": name,
+			"data-permissions": permissions
+		});
+		// filename td
+		td = $('<td></td>').attr({
+			"class": "filename",
+			"style": 'background-image:url('+iconurl+')'
+		});
+		td.append('<input type="checkbox" />');
+		var link_elem = $('<a></a>').attr({
+			"class": "name",
+			"href": linktarget
+		});
+		//split extension from filename for non dirs
+		if (type != 'dir' && name.indexOf('.')!=-1) {
 			basename=name.substr(0,name.lastIndexOf('.'));
 			extension=name.substr(name.lastIndexOf('.'));
-		}else{
+		} else {
 			basename=name;
 			extension=false;
 		}
-		html+='<td class="filename" style="background-image:url('+img+')"><input type="checkbox" />';
-		html+='<a class="name" href="download.php?file='+$('#dir').val().replace(/</, '&lt;').replace(/>/, '&gt;')+'/'+escapeHTML(name)+'"><span class="nametext">'+escapeHTML(basename);
+		var name_span=$('<span></span>').addClass('nametext').text(basename);
+		link_elem.append(name_span);
 		if(extension){
-			html+='<span class="extension">'+escapeHTML(extension)+'</span>';
+			name_span.append($('<span></span>').addClass('extension').text(extension));
+		}
+		//dirs can show the number of uploaded files 
+		if (type == 'dir') {
+			link_elem.append($('<span></span>').attr({
+				'class': 'uploadtext',
+				'currentUploads': 0
+			}));
 		}
-		html+='</span></a></td>';
-		if(size!='Pending'){
+		td.append(link_elem);
+		tr.append(td);
+		
+		//size column
+		if(size!=t('files', 'Pending')){
 			simpleSize=simpleFileSize(size);
 		}else{
-			simpleSize='Pending';
+			simpleSize=t('files', 'Pending');
 		}
-		sizeColor = Math.round(200-size/(1024*1024)*2);
-		lastModifiedTime=Math.round(lastModified.getTime() / 1000);
-		modifiedColor=Math.round((Math.round((new Date()).getTime() / 1000)-lastModifiedTime)/60/60/24*14);
-		html+='<td class="filesize" title="'+humanFileSize(size)+'" style="color:rgb('+sizeColor+','+sizeColor+','+sizeColor+')">'+simpleSize+'</td>';
-		html+='<td class="date"><span class="modified" title="'+formatDate(lastModified)+'" style="color:rgb('+modifiedColor+','+modifiedColor+','+modifiedColor+')">'+relative_modified_date(lastModified.getTime() / 1000)+'</span></td>';
-		html+='</tr>';
-		FileList.insertElement(name,'file',$(html).attr('data-file',name));
+		var sizeColor = Math.round(200-Math.pow((size/(1024*1024)),2));
+		var lastModifiedTime = Math.round(lastModified.getTime() / 1000);
+		td = $('<td></td>').attr({
+			"class": "filesize",
+			"title": humanFileSize(size),
+			"style": 'color:rgb('+sizeColor+','+sizeColor+','+sizeColor+')'
+		}).text(simpleSize);
+		tr.append(td);
+		
+		// date column
+		var modifiedColor = Math.round((Math.round((new Date()).getTime() / 1000)-lastModifiedTime)/60/60/24*5);
+		td = $('<td></td>').attr({ "class": "date" });
+		td.append($('<span></span>').attr({
+			"class": "modified",
+			"title": formatDate(lastModified),
+			"style": 'color:rgb('+modifiedColor+','+modifiedColor+','+modifiedColor+')'
+		}).text( relative_modified_date(lastModified.getTime() / 1000) ));
+		tr.append(td);
+		return tr;
+	},
+	addFile:function(name,size,lastModified,loading,hidden){
+		var imgurl;
+		if (loading) {
+			imgurl = OC.imagePath('core', 'loading.gif');
+		} else {
+			imgurl = OC.imagePath('core', 'filetypes/file.png');
+		}
+		var tr = this.createRow(
+			'file',
+			name,
+			imgurl,
+			OC.Router.generate('download', { file: $('#dir').val()+'/'+name }),
+			size,
+			lastModified,
+			$('#permissions').val()
+		);
+			
+		FileList.insertElement(name, 'file', tr.attr('data-file',name));
 		var row = $('tr').filterAttr('data-file',name);
 		if(loading){
 			row.data('loading',true);
@@ -44,30 +101,18 @@ var FileList={
 		FileActions.display(row.find('td.filename'));
 	},
 	addDir:function(name,size,lastModified,hidden){
-		var html, td, link_elem, sizeColor, lastModifiedTime, modifiedColor;
-		html = $('<tr></tr>').attr({ "data-type": "dir", "data-size": size, "data-file": name, "data-permissions": $('#permissions').val()});
-		td = $('<td></td>').attr({"class": "filename", "style": 'background-image:url('+OC.imagePath('core', 'filetypes/folder.png')+')' });
-		td.append('<input type="checkbox" />');
-		link_elem = $('<a></a>').attr({ "class": "name", "href": OC.linkTo('files', 'index.php')+"?dir="+ encodeURIComponent($('#dir').val()+'/'+name).replace(/%2F/g, '/') });
-		link_elem.append($('<span></span>').addClass('nametext').text(name));
-		link_elem.append($('<span></span>').attr({'class': 'uploadtext', 'currentUploads': 0}));
-		td.append(link_elem);
-		html.append(td);
-		if(size!='Pending'){
-			simpleSize=simpleFileSize(size);
-		}else{
-			simpleSize='Pending';
-		}
-		sizeColor = Math.round(200-Math.pow((size/(1024*1024)),2));
-		lastModifiedTime=Math.round(lastModified.getTime() / 1000);
-		modifiedColor=Math.round((Math.round((new Date()).getTime() / 1000)-lastModifiedTime)/60/60/24*5);
-		td = $('<td></td>').attr({ "class": "filesize", "title": humanFileSize(size), "style": 'color:rgb('+sizeColor+','+sizeColor+','+sizeColor+')'}).text(simpleSize);
-		html.append(td);
-
-		td = $('<td></td>').attr({ "class": "date" });
-		td.append($('<span></span>').attr({ "class": "modified", "title": formatDate(lastModified), "style": 'color:rgb('+modifiedColor+','+modifiedColor+','+modifiedColor+')' }).text( relative_modified_date(lastModified.getTime() / 1000) ));
-		html.append(td);
-		FileList.insertElement(name,'dir',html);
+		
+		var tr = this.createRow(
+			'dir',
+			name,
+			OC.imagePath('core', 'filetypes/folder.png'),
+			OC.linkTo('files', 'index.php')+"?dir="+ encodeURIComponent($('#dir').val()+'/'+name).replace(/%2F/g, '/'),
+			size,
+			lastModified,
+			$('#permissions').val()
+		);
+			
+		FileList.insertElement(name,'dir',tr);
 		var row = $('tr').filterAttr('data-file',name);
 		row.find('td.filename').draggable(dragOptions);
 		row.find('td.filename').droppable(folderDropOptions);
@@ -216,9 +261,6 @@ var FileList={
 	},
 	replace:function(oldName, newName, isNewFile) {
 		// Finish any existing actions
-		if (FileList.lastAction || !FileList.useUndo) {
-			FileList.lastAction();
-		}
 		$('tr').filterAttr('data-file', oldName).hide();
 		$('tr').filterAttr('data-file', newName).hide();
 		var tr = $('tr').filterAttr('data-file', oldName).clone();
@@ -321,7 +363,6 @@ $(document).ready(function(){
 				// Delete the new uploaded file
 				FileList.deleteCanceled = false;
 				FileList.deleteFiles = [FileList.replaceOldName];
-				FileList.finishDelete(null, true);
 			} else {
 				$('tr').filterAttr('data-file', FileList.replaceOldName).show();
 			}
@@ -348,7 +389,6 @@ $(document).ready(function(){
 		if ($('#notification').data('isNewFile')) {
 			FileList.deleteCanceled = false;
 			FileList.deleteFiles = [$('#notification').data('oldName')];
-			FileList.finishDelete(null, true);
 		}
 	});
 	FileList.useUndo=(window.onbeforeunload)?true:false;
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 7c377afc620..5c5b430a8d4 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -262,12 +262,6 @@ $(document).ready(function() {
 							return;
 						}
 						totalSize+=files[i].size;
-						if(FileList.deleteFiles && FileList.deleteFiles.indexOf(files[i].name)!=-1){//finish delete if we are uploading a deleted file
-							FileList.finishDelete(function(){
-								$('#file_upload_start').change();
-							});
-							return;
-						}
 					}
 				}
 				if(totalSize>$('#max_upload').val()){
diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php
index 3d676810c7c..dbff81cef6c 100644
--- a/apps/files/l10n/bn_BD.php
+++ b/apps/files/l10n/bn_BD.php
@@ -7,7 +7,6 @@
 "No file was uploaded" => "কোন ফাইল আপলোড করা হয় নি",
 "Missing a temporary folder" => "অস্থায়ী ফোল্ডার খোয়া গিয়েছে",
 "Failed to write to disk" => "ডিস্কে লিখতে ব্যর্থ",
-"Not enough space available" => "যথেষ্ঠ পরিমাণ স্থান নেই",
 "Invalid directory." => "ভুল ডিরেক্টরি",
 "Files" => "ফাইল",
 "Unshare" => "ভাগাভাগি বাতিল ",
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 22b684fcfd7..49ea7f73abb 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -7,10 +7,10 @@
 "No file was uploaded" => "El fitxer no s'ha pujat",
 "Missing a temporary folder" => "S'ha perdut un fitxer temporal",
 "Failed to write to disk" => "Ha fallat en escriure al disc",
-"Not enough space available" => "No hi ha prou espai disponible",
 "Invalid directory." => "Directori no vàlid.",
 "Files" => "Fitxers",
 "Unshare" => "Deixa de compartir",
+"Delete permanently" => "Esborra permanentment",
 "Delete" => "Suprimeix",
 "Rename" => "Reanomena",
 "{new_name} already exists" => "{new_name} ja existeix",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index f0beda9f55c..c2085a3aa9a 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -7,10 +7,10 @@
 "No file was uploaded" => "Žádný soubor nebyl odeslán",
 "Missing a temporary folder" => "Chybí adresář pro dočasné soubory",
 "Failed to write to disk" => "Zápis na disk selhal",
-"Not enough space available" => "Nedostatek dostupného místa",
 "Invalid directory." => "Neplatný adresář",
 "Files" => "Soubory",
 "Unshare" => "Zrušit sdílení",
+"Delete permanently" => "Trvale odstranit",
 "Delete" => "Smazat",
 "Rename" => "Přejmenovat",
 "{new_name} already exists" => "{new_name} již existuje",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 55ea24baa2f..4b38619eaa5 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -7,7 +7,6 @@
 "No file was uploaded" => "Es wurde keine Datei hochgeladen.",
 "Missing a temporary folder" => "Temporärer Ordner fehlt.",
 "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
-"Not enough space available" => "Nicht genug Speicherplatz verfügbar",
 "Invalid directory." => "Ungültiges Verzeichnis.",
 "Files" => "Dateien",
 "Unshare" => "Nicht mehr freigeben",
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 18f3ee38028..71f24eba4c8 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -7,10 +7,10 @@
 "No file was uploaded" => "Es wurde keine Datei hochgeladen.",
 "Missing a temporary folder" => "Der temporäre Ordner fehlt.",
 "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
-"Not enough space available" => "Nicht genügend Speicherplatz verfügbar",
 "Invalid directory." => "Ungültiges Verzeichnis.",
 "Files" => "Dateien",
 "Unshare" => "Nicht mehr freigeben",
+"Delete permanently" => "Entgültig löschen",
 "Delete" => "Löschen",
 "Rename" => "Umbenennen",
 "{new_name} already exists" => "{new_name} existiert bereits",
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 7b458bf35dd..a9c5fda0981 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -7,7 +7,6 @@
 "No file was uploaded" => "Κανένα αρχείο δεν στάλθηκε",
 "Missing a temporary folder" => "Λείπει ο προσωρινός φάκελος",
 "Failed to write to disk" => "Αποτυχία εγγραφής στο δίσκο",
-"Not enough space available" => "Δεν υπάρχει αρκετός διαθέσιμος χώρος",
 "Invalid directory." => "Μη έγκυρος φάκελος.",
 "Files" => "Αρχεία",
 "Unshare" => "Διακοπή κοινής χρήσης",
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index a510d47ad6c..ba78e8b56d7 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -7,7 +7,6 @@
 "No file was uploaded" => "Neniu dosiero estas alŝutita",
 "Missing a temporary folder" => "Mankas tempa dosierujo",
 "Failed to write to disk" => "Malsukcesis skribo al disko",
-"Not enough space available" => "Ne haveblas sufiĉa spaco",
 "Invalid directory." => "Nevalida dosierujo.",
 "Files" => "Dosieroj",
 "Unshare" => "Malkunhavigi",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 201e731179a..9d45e6035c7 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -7,10 +7,10 @@
 "No file was uploaded" => "No se ha subido ningún archivo",
 "Missing a temporary folder" => "Falta un directorio temporal",
 "Failed to write to disk" => "La escritura en disco ha fallado",
-"Not enough space available" => "No hay suficiente espacio disponible",
 "Invalid directory." => "Directorio invalido.",
 "Files" => "Archivos",
 "Unshare" => "Dejar de compartir",
+"Delete permanently" => "Eliminar permanentemente",
 "Delete" => "Eliminar",
 "Rename" => "Renombrar",
 "{new_name} already exists" => "{new_name} ya existe",
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index ea8352e3251..e805f24ce4c 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -7,7 +7,6 @@
 "No file was uploaded" => "El archivo no fue subido",
 "Missing a temporary folder" => "Falta un directorio temporal",
 "Failed to write to disk" => "Error al escribir en el disco",
-"Not enough space available" => "No hay suficiente espacio disponible",
 "Invalid directory." => "Directorio invalido.",
 "Files" => "Archivos",
 "Unshare" => "Dejar de compartir",
@@ -20,6 +19,7 @@
 "replaced {new_name}" => "reemplazado {new_name}",
 "undo" => "deshacer",
 "replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}",
+"perform delete operation" => "Eliminar",
 "'.' is an invalid file name." => "'.' es un nombre de archivo inválido.",
 "File name cannot be empty." => "El nombre del archivo no puede quedar vacío.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos.",
@@ -56,11 +56,13 @@
 "Text file" => "Archivo de texto",
 "Folder" => "Carpeta",
 "From link" => "Desde enlace",
+"Trash" => "Papelera",
 "Cancel upload" => "Cancelar subida",
 "Nothing in here. Upload something!" => "No hay nada. ¡Subí contenido!",
 "Download" => "Descargar",
 "Upload too large" => "El archivo es demasiado grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que intentás subir sobrepasan el tamaño máximo ",
 "Files are being scanned, please wait." => "Se están escaneando los archivos, por favor esperá.",
-"Current scanning" => "Escaneo actual"
+"Current scanning" => "Escaneo actual",
+"Upgrading filesystem cache..." => "Actualizando el cache del sistema de archivos"
 );
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 6f4c55f4846..45c515814e7 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -7,7 +7,6 @@
 "No file was uploaded" => "Ez da fitxategirik igo",
 "Missing a temporary folder" => "Aldi baterako karpeta falta da",
 "Failed to write to disk" => "Errore bat izan da diskoan idazterakoan",
-"Not enough space available" => "Ez dago leku nahikorik.",
 "Invalid directory." => "Baliogabeko karpeta.",
 "Files" => "Fitxategiak",
 "Unshare" => "Ez elkarbanatu",
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index a4181c6ff53..2559d597a79 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -7,7 +7,6 @@
 "No file was uploaded" => "هیچ فایلی بارگذاری نشده",
 "Missing a temporary folder" => "یک پوشه موقت گم شده است",
 "Failed to write to disk" => "نوشتن بر روی دیسک سخت ناموفق بود",
-"Not enough space available" => "فضای کافی در دسترس نیست",
 "Invalid directory." => "فهرست راهنما نامعتبر می باشد.",
 "Files" => "فایل ها",
 "Unshare" => "لغو اشتراک",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index 809a5e5c554..6a425e76090 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -6,7 +6,6 @@
 "No file was uploaded" => "Yhtäkään tiedostoa ei lähetetty",
 "Missing a temporary folder" => "Väliaikaiskansiota ei ole olemassa",
 "Failed to write to disk" => "Levylle kirjoitus epäonnistui",
-"Not enough space available" => "Tilaa ei ole riittävästi",
 "Invalid directory." => "Virheellinen kansio.",
 "Files" => "Tiedostot",
 "Unshare" => "Peru jakaminen",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 4be699c0017..45281d277ff 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -7,10 +7,10 @@
 "No file was uploaded" => "Aucun fichier n'a été téléversé",
 "Missing a temporary folder" => "Il manque un répertoire temporaire",
 "Failed to write to disk" => "Erreur d'écriture sur le disque",
-"Not enough space available" => "Espace disponible insuffisant",
 "Invalid directory." => "Dossier invalide.",
 "Files" => "Fichiers",
 "Unshare" => "Ne plus partager",
+"Delete permanently" => "Supprimer de façon définitive",
 "Delete" => "Supprimer",
 "Rename" => "Renommer",
 "{new_name} already exists" => "{new_name} existe déjà",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index a1c0f0a5dd5..362e92dacea 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -7,7 +7,6 @@
 "No file was uploaded" => "Non se enviou ningún ficheiro",
 "Missing a temporary folder" => "Falta un cartafol temporal",
 "Failed to write to disk" => "Erro ao escribir no disco",
-"Not enough space available" => "O espazo dispoñíbel é insuficiente",
 "Invalid directory." => "O directorio é incorrecto.",
 "Files" => "Ficheiros",
 "Unshare" => "Deixar de compartir",
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index 86fc0f223f9..26d56480790 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -7,7 +7,6 @@
 "No file was uploaded" => "Nem töltődött fel semmi",
 "Missing a temporary folder" => "Hiányzik egy ideiglenes mappa",
 "Failed to write to disk" => "Nem sikerült a lemezre történő írás",
-"Not enough space available" => "Nincs elég szabad hely",
 "Invalid directory." => "Érvénytelen mappa.",
 "Files" => "Fájlok",
 "Unshare" => "Megosztás visszavonása",
diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php
index 43c10ef236e..f8d9789cf0f 100644
--- a/apps/files/l10n/is.php
+++ b/apps/files/l10n/is.php
@@ -7,7 +7,6 @@
 "No file was uploaded" => "Engin skrá skilaði sér",
 "Missing a temporary folder" => "Vantar bráðabirgðamöppu",
 "Failed to write to disk" => "Tókst ekki að skrifa á disk",
-"Not enough space available" => "Ekki nægt pláss tiltækt",
 "Invalid directory." => "Ógild mappa.",
 "Files" => "Skrár",
 "Unshare" => "Hætta deilingu",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index bb3a5bdf054..3d6eb254e59 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -7,10 +7,10 @@
 "No file was uploaded" => "Nessun file è stato caricato",
 "Missing a temporary folder" => "Cartella temporanea mancante",
 "Failed to write to disk" => "Scrittura su disco non riuscita",
-"Not enough space available" => "Spazio disponibile insufficiente",
 "Invalid directory." => "Cartella non valida.",
 "Files" => "File",
 "Unshare" => "Rimuovi condivisione",
+"Delete permanently" => "Elimina definitivamente",
 "Delete" => "Elimina",
 "Rename" => "Rinomina",
 "{new_name} already exists" => "{new_name} esiste già",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index c8b1054f30b..1caa308c1b8 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -7,10 +7,10 @@
 "No file was uploaded" => "ファイルはアップロードされませんでした",
 "Missing a temporary folder" => "テンポラリフォルダが見つかりません",
 "Failed to write to disk" => "ディスクへの書き込みに失敗しました",
-"Not enough space available" => "利用可能なスペースが十分にありません",
 "Invalid directory." => "無効なディレクトリです。",
 "Files" => "ファイル",
 "Unshare" => "共有しない",
+"Delete permanently" => "完全に削除する",
 "Delete" => "削除",
 "Rename" => "名前の変更",
 "{new_name} already exists" => "{new_name} はすでに存在しています",
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index 7774aeea31c..98d0d602801 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -7,7 +7,6 @@
 "No file was uploaded" => "업로드된 파일 없음",
 "Missing a temporary folder" => "임시 폴더가 사라짐",
 "Failed to write to disk" => "디스크에 쓰지 못했습니다",
-"Not enough space available" => "여유 공간이 부족합니다",
 "Invalid directory." => "올바르지 않은 디렉터리입니다.",
 "Files" => "파일",
 "Unshare" => "공유 해제",
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index 25c1da73beb..57b391e444c 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -7,10 +7,10 @@
 "No file was uploaded" => "Neviena datne netika augšupielādēta",
 "Missing a temporary folder" => "Trūkst pagaidu mapes",
 "Failed to write to disk" => "Neizdevās saglabāt diskā",
-"Not enough space available" => "Nepietiek brīvas vietas",
 "Invalid directory." => "Nederīga direktorija.",
 "Files" => "Datnes",
 "Unshare" => "Pārtraukt dalīšanos",
+"Delete permanently" => "Dzēst pavisam",
 "Delete" => "Dzēst",
 "Rename" => "Pārsaukt",
 "{new_name} already exists" => "{new_name} jau eksistē",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index addd3a93723..9095149cd9d 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -7,10 +7,10 @@
 "No file was uploaded" => "Geen bestand geüpload",
 "Missing a temporary folder" => "Een tijdelijke map mist",
 "Failed to write to disk" => "Schrijven naar schijf mislukt",
-"Not enough space available" => "Niet genoeg ruimte beschikbaar",
 "Invalid directory." => "Ongeldige directory.",
 "Files" => "Bestanden",
 "Unshare" => "Stop delen",
+"Delete permanently" => "Verwijder definitief",
 "Delete" => "Verwijder",
 "Rename" => "Hernoem",
 "{new_name} already exists" => "{new_name} bestaat al",
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index 6855850f0da..45d0f436614 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -7,7 +7,6 @@
 "No file was uploaded" => "Nie przesłano żadnego pliku",
 "Missing a temporary folder" => "Brak katalogu tymczasowego",
 "Failed to write to disk" => "Błąd zapisu na dysk",
-"Not enough space available" => "Za mało miejsca",
 "Invalid directory." => "Zła ścieżka.",
 "Files" => "Pliki",
 "Unshare" => "Nie udostępniaj",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index b1d7385bc58..52c87ed728a 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -7,10 +7,10 @@
 "No file was uploaded" => "Não foi enviado nenhum ficheiro",
 "Missing a temporary folder" => "Falta uma pasta temporária",
 "Failed to write to disk" => "Falhou a escrita no disco",
-"Not enough space available" => "Espaço em disco insuficiente!",
 "Invalid directory." => "Directório Inválido",
 "Files" => "Ficheiros",
 "Unshare" => "Deixar de partilhar",
+"Delete permanently" => "Eliminar permanentemente",
 "Delete" => "Apagar",
 "Rename" => "Renomear",
 "{new_name} already exists" => "O nome {new_name} já existe",
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index 7837b1f5b30..79ca1cf4f51 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -7,7 +7,6 @@
 "No file was uploaded" => "Niciun fișier încărcat",
 "Missing a temporary folder" => "Lipsește un dosar temporar",
 "Failed to write to disk" => "Eroare la scriere pe disc",
-"Not enough space available" => "Nu este suficient spațiu disponibil",
 "Invalid directory." => "Director invalid.",
 "Files" => "Fișiere",
 "Unshare" => "Anulează partajarea",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 716afa5f29a..05542452e7f 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -7,10 +7,10 @@
 "No file was uploaded" => "Файл не был загружен",
 "Missing a temporary folder" => "Невозможно найти временную папку",
 "Failed to write to disk" => "Ошибка записи на диск",
-"Not enough space available" => "Недостаточно свободного места",
 "Invalid directory." => "Неправильный каталог.",
 "Files" => "Файлы",
 "Unshare" => "Отменить публикацию",
+"Delete permanently" => "Удалено навсегда",
 "Delete" => "Удалить",
 "Rename" => "Переименовать",
 "{new_name} already exists" => "{new_name} уже существует",
@@ -20,9 +20,13 @@
 "replaced {new_name}" => "заменено {new_name}",
 "undo" => "отмена",
 "replaced {new_name} with {old_name}" => "заменено {new_name} на {old_name}",
+"perform delete operation" => "выполняется операция удаления",
 "'.' 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" => "Не удается загрузить файл размером 0 байт в каталог",
 "Upload Error" => "Ошибка загрузки",
 "Close" => "Закрыть",
@@ -53,11 +57,13 @@
 "Text file" => "Текстовый файл",
 "Folder" => "Папка",
 "From link" => "Из ссылки",
+"Trash" => "Корзина",
 "Cancel upload" => "Отмена загрузки",
 "Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
 "Download" => "Скачать",
 "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" => "Текущее сканирование"
+"Current scanning" => "Текущее сканирование",
+"Upgrading filesystem cache..." => "Обновление кеша файловой системы..."
 );
diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php
index e1952567d31..9b2913970f2 100644
--- a/apps/files/l10n/ru_RU.php
+++ b/apps/files/l10n/ru_RU.php
@@ -7,10 +7,10 @@
 "No file was uploaded" => "Файл не был загружен",
 "Missing a temporary folder" => "Отсутствует временная папка",
 "Failed to write to disk" => "Не удалось записать на диск",
-"Not enough space available" => "Не достаточно свободного места",
 "Invalid directory." => "Неверный каталог.",
 "Files" => "Файлы",
 "Unshare" => "Скрыть",
+"Delete permanently" => "Удалить навсегда",
 "Delete" => "Удалить",
 "Rename" => "Переименовать",
 "{new_name} already exists" => "{новое_имя} уже существует",
@@ -20,9 +20,13 @@
 "replaced {new_name}" => "заменено {новое_имя}",
 "undo" => "отменить действие",
 "replaced {new_name} with {old_name}" => "заменено {новое_имя} с {старое_имя}",
+"perform delete operation" => "выполняется процесс удаления",
 "'.' 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 так как он имеет нулевой размер или является директорией",
 "Upload Error" => "Ошибка загрузки",
 "Close" => "Закрыть",
@@ -53,6 +57,7 @@
 "Text file" => "Текстовый файл",
 "Folder" => "Папка",
 "From link" => "По ссылке",
+"Trash" => "Корзина",
 "Cancel upload" => "Отмена загрузки",
 "Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
 "Download" => "Загрузить",
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 9c27e215397..be7f77adab0 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -7,10 +7,10 @@
 "No file was uploaded" => "Žiaden súbor nebol nahraný",
 "Missing a temporary folder" => "Chýbajúci dočasný priečinok",
 "Failed to write to disk" => "Zápis na disk sa nepodaril",
-"Not enough space available" => "Nie je k dispozícii dostatok miesta",
 "Invalid directory." => "Neplatný adresár",
 "Files" => "Súbory",
 "Unshare" => "Nezdielať",
+"Delete permanently" => "Zmazať  trvalo",
 "Delete" => "Odstrániť",
 "Rename" => "Premenovať",
 "{new_name} already exists" => "{new_name} už existuje",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 55493e24943..ebdaae9193f 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -7,7 +7,6 @@
 "No file was uploaded" => "Ingen fil blev uppladdad",
 "Missing a temporary folder" => "Saknar en tillfällig mapp",
 "Failed to write to disk" => "Misslyckades spara till disk",
-"Not enough space available" => "Inte tillräckligt med utrymme tillgängligt",
 "Invalid directory." => "Felaktig mapp.",
 "Files" => "Filer",
 "Unshare" => "Sluta dela",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 06dab9d8e6c..5f880702b82 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -7,7 +7,6 @@
 "No file was uploaded" => "ยังไม่มีไฟล์ที่ถูกอัพโหลด",
 "Missing a temporary folder" => "แฟ้มเอกสารชั่วคราวเกิดการสูญหาย",
 "Failed to write to disk" => "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว",
-"Not enough space available" => "มีพื้นที่เหลือไม่เพียงพอ",
 "Invalid directory." => "ไดเร็กทอรี่ไม่ถูกต้อง",
 "Files" => "ไฟล์",
 "Unshare" => "ยกเลิกการแชร์ข้อมูล",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 3412d8ad448..3325cbe1ee4 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -7,7 +7,6 @@
 "No file was uploaded" => "Hiç dosya yüklenmedi",
 "Missing a temporary folder" => "Geçici bir klasör eksik",
 "Failed to write to disk" => "Diske yazılamadı",
-"Not enough space available" => "Yeterli disk alanı yok",
 "Invalid directory." => "Geçersiz dizin.",
 "Files" => "Dosyalar",
 "Unshare" => "Paylaşılmayan",
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index 9831dfe0f8f..4a76158c462 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -7,8 +7,10 @@
 "No file was uploaded" => "Не відвантажено жодного файлу",
 "Missing a temporary folder" => "Відсутній тимчасовий каталог",
 "Failed to write to disk" => "Невдалося записати на диск",
+"Invalid directory." => "Невірний каталог.",
 "Files" => "Файли",
 "Unshare" => "Заборонити доступ",
+"Delete permanently" => "Видалити назавжди",
 "Delete" => "Видалити",
 "Rename" => "Перейменувати",
 "{new_name} already exists" => "{new_name} вже існує",
@@ -18,7 +20,13 @@
 "replaced {new_name}" => "замінено {new_name}",
 "undo" => "відмінити",
 "replaced {new_name} with {old_name}" => "замінено {new_name} на {old_name}",
+"perform delete operation" => "виконати операцію видалення",
+"'.' 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" => "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт",
 "Upload Error" => "Помилка завантаження",
 "Close" => "Закрити",
@@ -28,6 +36,7 @@
 "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" => "Невірне ім'я теки. Використання \"Shared\" зарезервовано Owncloud",
 "Name" => "Ім'я",
 "Size" => "Розмір",
 "Modified" => "Змінено",
@@ -48,11 +57,13 @@
 "Text file" => "Текстовий файл",
 "Folder" => "Папка",
 "From link" => "З посилання",
+"Trash" => "Смітник",
 "Cancel upload" => "Перервати завантаження",
 "Nothing in here. Upload something!" => "Тут нічого немає. Відвантажте що-небудь!",
 "Download" => "Завантажити",
 "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" => "Поточне сканування"
+"Current scanning" => "Поточне сканування",
+"Upgrading filesystem cache..." => "Оновлення кеша файлової системи..."
 );
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 2491d645340..3c87ee2b73f 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -7,7 +7,6 @@
 "No file was uploaded" => "文件没有上传",
 "Missing a temporary folder" => "缺少临时目录",
 "Failed to write to disk" => "写入磁盘失败",
-"Not enough space available" => "没有足够可用空间",
 "Invalid directory." => "无效文件夹。",
 "Files" => "文件",
 "Unshare" => "取消分享",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 104cb3a619f..439907821d4 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -7,7 +7,6 @@
 "No file was uploaded" => "無已上傳檔案",
 "Missing a temporary folder" => "遺失暫存資料夾",
 "Failed to write to disk" => "寫入硬碟失敗",
-"Not enough space available" => "沒有足夠的可用空間",
 "Invalid directory." => "無效的資料夾。",
 "Files" => "檔案",
 "Unshare" => "取消共享",
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 0b4aa21eac3..7cf65915af0 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -37,7 +37,7 @@
 			</div>
 			<?php if ($_['trash'] ): ?>
 			<div id="trash" class="button">
-				<a><?php echo $l->t('Trash');?></a>
+				<a><?php echo $l->t('Trash bin');?></a>
 			</div>
 			<?php endif; ?>
 			<div id="uploadprogresswrapper">
diff --git a/apps/files_encryption/ajax/mode.php b/apps/files_encryption/ajax/mode.php
deleted file mode 100644
index 64c5be94401..00000000000
--- a/apps/files_encryption/ajax/mode.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**

- * Copyright (c) 2012, Bjoern Schiessle <schiessle@owncloud.com>

- * This file is licensed under the Affero General Public License version 3 or later.

- * See the COPYING-README file.

- */
-

-use OCA\Encryption\Keymanager;
-
-OCP\JSON::checkAppEnabled('files_encryption');

-OCP\JSON::checkLoggedIn();

-OCP\JSON::callCheck();

-
-$mode = $_POST['mode'];
-$changePasswd = false;
-$passwdChanged = false;
-
-if ( isset($_POST['newpasswd']) && isset($_POST['oldpasswd']) ) {
-	$oldpasswd = $_POST['oldpasswd'];
-	$newpasswd = $_POST['newpasswd'];
-	$changePasswd = true;
-	$passwdChanged = Keymanager::changePasswd($oldpasswd, $newpasswd);
-}
-
-$query = \OC_DB::prepare( "SELECT mode FROM *PREFIX*encryption WHERE uid = ?" );

-$result = $query->execute(array(\OCP\User::getUser()));

-
-if ($result->fetchRow()){
-	$query = OC_DB::prepare( 'UPDATE *PREFIX*encryption SET mode = ? WHERE uid = ?' );
-} else {
-	$query = OC_DB::prepare( 'INSERT INTO *PREFIX*encryption ( mode, uid ) VALUES( ?, ? )' );
-}
-
-if ( (!$changePasswd || $passwdChanged) && $query->execute(array($mode, \OCP\User::getUser())) ) {
-	OCP\JSON::success();
-} else {
-	OCP\JSON::error();
-}
\ No newline at end of file
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index e426f237bbe..08728622525 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -12,7 +12,7 @@ OC_FileProxy::register( new OCA\Encryption\Proxy() );
 
 // User-related hooks
 OCP\Util::connectHook( 'OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login' );
-OCP\Util::connectHook( 'OC_User', 'post_setPassword','OCA\Encryption\Hooks', 'setPassphrase' );
+OCP\Util::connectHook( 'OC_User', 'pre_setPassword','OCA\Encryption\Hooks', 'setPassphrase' );
 
 // Sharing-related hooks
 OCP\Util::connectHook( 'OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared' );
@@ -43,6 +43,6 @@ if (
 
 }
 
-// Reguster settings scripts
+// Register settings scripts
 OCP\App::registerAdmin( 'files_encryption', 'settings' );
-OCP\App::registerPersonal( 'files_encryption', 'settings-personal' );
\ No newline at end of file
+OCP\App::registerPersonal( 'files_encryption', 'settings-personal' );
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 065ef9d2410..7e4f677ce9d 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -38,12 +38,15 @@ class Hooks {
 	 */

 	public static function login( $params ) {

 	

+		// Manually initialise Filesystem{} singleton with correct 

+		// fake root path, in order to avoid fatal webdav errors

 		\OC\Files\Filesystem::init( $params['uid'] . '/' . 'files' . '/' );

 	

 		$view = new \OC_FilesystemView( '/' );

 

 		$util = new Util( $view, $params['uid'] );

 		

+		// Check files_encryption infrastructure is ready for action

 		if ( ! $util->ready() ) {

 			

 			\OC_Log::write( 'Encryption library', 'User account "' . $params['uid'] . '" is not ready for encryption; configuration started', \OC_Log::DEBUG );

@@ -104,14 +107,16 @@ class Hooks {
 	 * @param array $params keys: uid, password

 	 */

 	public static function setPassphrase( $params ) {

-	

+		

 		// Only attempt to change passphrase if server-side encryption

 		// is in use (client-side encryption does not have access to 

 		// the necessary keys)

 		if ( Crypt::mode() == 'server' ) {

 			

+			$session = new Session();

+			

 			// Get existing decrypted private key

-			$privateKey = $_SESSION['privateKey'];

+			$privateKey = $session->getPrivateKey();

 			

 			// Encrypt private key with new user pwd as passphrase

 			$encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $privateKey, $params['password'] );

@@ -160,16 +165,6 @@ class Hooks {
 	 * @brief 

 	 */

 	public static function postShared( $params ) {

-		

-		// Delete existing catfile

-		Keymanager::deleteFileKey(  );

-		

-		// Generate new catfile and env keys

-		Crypt::multiKeyEncrypt( $plainContent, $publicKeys );

-		

-		// Save env keys to user folders

-		

-		

 	}

 	

 	/**

diff --git a/apps/files_encryption/js/settings-personal.js b/apps/files_encryption/js/settings-personal.js
deleted file mode 100644
index 1a53e99d2b4..00000000000
--- a/apps/files_encryption/js/settings-personal.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Copyright (c) 2012, Bjoern Schiessle <schiessle@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */
-
-$(document).ready(function(){
-	$('input[name=encryption_mode]').change(function(){
-		var prevmode = document.getElementById('prev_encryption_mode').value
-		var  client=$('input[value="client"]:checked').val()
-			 ,server=$('input[value="server"]:checked').val()
-			 ,user=$('input[value="user"]:checked').val()
-			 ,none=$('input[value="none"]:checked').val()
-		if (client) {
-			$.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'client' });
-			if (prevmode == 'server') {
-				OC.dialogs.info(t('encryption', 'Please switch to your ownCloud client and change your encryption password to complete the conversion.'), t('encryption', 'switched to client side encryption'));
-			}
-		} else if (server) {
-			if (prevmode == 'client') {
-				OC.dialogs.form([{text:'Login password', name:'newpasswd', type:'password'},{text:'Encryption password used on the client', name:'oldpasswd', type:'password'}],t('encryption', 'Change encryption password to login password'), function(data) {
-					$.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'server', newpasswd: data[0].value, oldpasswd: data[1].value }, function(result) {
-						if (result.status != 'success') {
-							document.getElementById(prevmode+'_encryption').checked = true;
-							OC.dialogs.alert(t('encryption', 'Please check your passwords and try again.'), t('encryption', 'Could not change your file encryption password to your login password'))
-						} else {
-							console.log("alles super");
-						}
-					}, true);
-				});
-			} else {
-				$.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'server' });
-			}
-		} else {
-			$.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'none' });
-		}
-	})
-})
\ No newline at end of file
diff --git a/apps/files_encryption/js/settings.js b/apps/files_encryption/js/settings.js
index 60563bde859..0be857bb73e 100644
--- a/apps/files_encryption/js/settings.js
+++ b/apps/files_encryption/js/settings.js
@@ -9,38 +9,11 @@ $(document).ready(function(){
 	$('#encryption_blacklist').multiSelect({
 		oncheck:blackListChange,
 		onuncheck:blackListChange,
-		createText:'...',
+		createText:'...'
 	});
 	
 	function blackListChange(){
 		var blackList=$('#encryption_blacklist').val().join(',');
 		OC.AppConfig.setValue('files_encryption','type_blacklist',blackList);
 	}
-
-	//TODO: Handle switch between client and server side encryption
-	$('input[name=encryption_mode]').change(function(){
-		var  client=$('input[value="client"]:checked').val()
-			 ,server=$('input[value="server"]:checked').val()
-			 ,user=$('input[value="user"]:checked').val()
-			 ,none=$('input[value="none"]:checked').val()
-			 ,disable=false
-		if (client) {
-			OC.AppConfig.setValue('files_encryption','mode','client');
-			disable = true;
-		} else if (server) {
-			OC.AppConfig.setValue('files_encryption','mode','server');
-			disable = true;
-		} else if (user) {
-			OC.AppConfig.setValue('files_encryption','mode','user');
-			disable = true;
-		} else {
-			OC.AppConfig.setValue('files_encryption','mode','none');
-		}
-		if (disable) {
-			document.getElementById('server_encryption').disabled = true;
-			document.getElementById('client_encryption').disabled = true;
-			document.getElementById('user_encryption').disabled = true;
-			document.getElementById('none_encryption').disabled = true;
-		}
-	})
 })
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index 815cf1af003..1b888f7714b 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -5,5 +5,8 @@
 "Please check your passwords and try again." => "Comproveu les contrasenyes i proveu-ho de nou.",
 "Could not change your file encryption password to your login password" => "No s'ha pogut canviar la contrasenya d'encriptació de fitxers per la d'accés",
 "Encryption" => "Encriptatge",
+"File encryption is enabled." => "L'encriptació de fitxers està activada.",
+"The following file types will not be encrypted:" => "Els tipus de fitxers següents no s'encriptaran:",
+"Exclude the following file types from encryption:" => "Exclou els tipus de fitxers següents de l'encriptatge:",
 "None" => "Cap"
 );
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
index 27d2ae544b5..3278f13920a 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -5,5 +5,8 @@
 "Please check your passwords and try again." => "Zkontrolujte, prosím, své heslo a zkuste to znovu.",
 "Could not change your file encryption password to your login password" => "Nelze změnit šifrovací heslo na přihlašovací.",
 "Encryption" => "Šifrování",
+"File encryption is enabled." => "Šifrování je povoleno.",
+"The following file types will not be encrypted:" => "Následující typy souborů nebudou šifrovány:",
+"Exclude the following file types from encryption:" => "Vyjmout následující typy souborů ze šifrování:",
 "None" => "Žádné"
 );
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index c3c69e09007..465af23efdd 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -5,5 +5,8 @@
 "Please check your passwords and try again." => "Bitte überprüfen sie Ihr Passwort und versuchen Sie es erneut.",
 "Could not change your file encryption password to your login password" => "Ihr Verschlüsselungspasswort konnte nicht als Anmeldepasswort gesetzt werden.",
 "Encryption" => "Verschlüsselung",
+"File encryption is enabled." => "Datei-Verschlüsselung ist aktiviert",
+"The following file types will not be encrypted:" => "Die folgenden Datei-Typen werden nicht verschlüsselt:",
+"Exclude the following file types from encryption:" => "Die folgenden Datei-Typen von der Verschlüsselung ausnehmen:",
 "None" => "Keine"
 );
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index 87f984c2c10..73b5f273d1f 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -5,5 +5,8 @@
 "Please check your passwords and try again." => "Por favor revise su contraseña e intentelo de nuevo.",
 "Could not change your file encryption password to your login password" => "No se pudo cambiar la contraseña de cifrado de archivos de su contraseña de inicio de sesión",
 "Encryption" => "Cifrado",
+"File encryption is enabled." => "La encriptacion de archivo esta activada.",
+"The following file types will not be encrypted:" => "Los siguientes tipos de archivo no seran encriptados:",
+"Exclude the following file types from encryption:" => "Excluir los siguientes tipos de archivo de la encriptacion:",
 "None" => "Ninguno"
 );
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index 608778b2ec8..7d431e6e462 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -5,5 +5,8 @@
 "Please check your passwords and try again." => "Veuillez vérifier vos mots de passe et réessayer.",
 "Could not change your file encryption password to your login password" => "Impossible de convertir votre mot de passe de chiffrement en mot de passe de connexion",
 "Encryption" => "Chiffrement",
+"File encryption is enabled." => "Le chiffrement des fichiers est activé",
+"The following file types will not be encrypted:" => "Les fichiers de types suivants ne seront pas chiffrés :",
+"Exclude the following file types from encryption:" => "Ne pas chiffrer les fichiers dont les types sont les suivants :",
 "None" => "Aucun"
 );
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index 86e1a66c458..ffa20b718d9 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -5,5 +5,8 @@
 "Please check your passwords and try again." => "Controlla la password e prova ancora.",
 "Could not change your file encryption password to your login password" => "Impossibile convertire la password di cifratura nella password di accesso",
 "Encryption" => "Cifratura",
+"File encryption is enabled." => "La cifratura dei file è abilitata.",
+"The following file types will not be encrypted:" => "I seguenti tipi di file non saranno cifrati:",
+"Exclude the following file types from encryption:" => "Escludi i seguenti tipi di file dalla cifratura:",
 "None" => "Nessuna"
 );
diff --git a/apps/files_encryption/l10n/ja_JP.php b/apps/files_encryption/l10n/ja_JP.php
index 8d3df1f06ae..b7aeb8d8348 100644
--- a/apps/files_encryption/l10n/ja_JP.php
+++ b/apps/files_encryption/l10n/ja_JP.php
@@ -5,5 +5,8 @@
 "Please check your passwords and try again." => "パスワードを確認してもう一度行なってください。",
 "Could not change your file encryption password to your login password" => "ファイル暗号化パスワードをログインパスワードに変更できませんでした。",
 "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_encryption/l10n/lv.php b/apps/files_encryption/l10n/lv.php
index 7b94bb99e1a..1aae1377516 100644
--- a/apps/files_encryption/l10n/lv.php
+++ b/apps/files_encryption/l10n/lv.php
@@ -5,5 +5,8 @@
 "Please check your passwords and try again." => "Lūdzu, pārbaudiet savas paroles un mēģiniet vēlreiz.",
 "Could not change your file encryption password to your login password" => "Nevarēja mainīt datņu šifrēšanas paroli uz ierakstīšanās paroli",
 "Encryption" => "Šifrēšana",
+"File encryption is enabled." => "Datņu šifrēšana ir aktivēta.",
+"The following file types will not be encrypted:" => "Sekojošās datnes netiks šifrētas:",
+"Exclude the following file types from encryption:" => "Sekojošos datņu tipus izslēgt no šifrēšanas:",
 "None" => "Nav"
 );
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index fc8a7954a9e..c434330049b 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -1,8 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Please switch to your ownCloud client and change your encryption password to complete the conversion." => "Schakel om naar uw eigen ownCloud client en wijzig uw versleutelwachtwoord om de conversie af te ronden.",
 "switched to client side encryption" => "overgeschakeld naar client side encryptie",
 "Change encryption password to login password" => "Verander encryptie wachtwoord naar login wachtwoord",
 "Please check your passwords and try again." => "Controleer uw wachtwoorden en probeer het opnieuw.",
 "Could not change your file encryption password to your login password" => "Kon het bestandsencryptie wachtwoord niet veranderen naar het login wachtwoord",
 "Encryption" => "Versleuteling",
+"File encryption is enabled." => "Bestandsversleuteling geactiveerd.",
+"The following file types will not be encrypted:" => "De volgende bestandstypen zullen niet worden versleuteld:",
+"Exclude the following file types from encryption:" => "Sluit de volgende bestandstypen uit van versleuteling:",
 "None" => "Geen"
 );
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index c11cf74ecfb..651885fe022 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Please switch to your ownCloud client and change your encryption password to complete the conversion." => "Пожалуйста переключитесь на Ваш клиент ownCloud и поменяйте пароль шиврования для завершения преобразования.",
+"switched to client side encryption" => "переключён на шифрование со стороны клиента",
+"Change encryption password to login password" => "Изменить пароль шифрования для пароля входа",
+"Please check your passwords and try again." => "Пожалуйста проверьте пароли и попробуйте снова.",
+"Could not change your file encryption password to your login password" => "Невозможно изменить Ваш пароль файла шифрования для пароля входа",
 "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_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index 3a1e4c7e194..dc2907e704f 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -5,5 +5,8 @@
 "Please check your passwords and try again." => "Skontrolujte si heslo a skúste to znovu.",
 "Could not change your file encryption password to your login password" => "Nie je možné zmeniť šifrovacie heslo na prihlasovacie",
 "Encryption" => "Šifrovanie",
+"File encryption is enabled." => "Kryptovanie súborov nastavené.",
+"The following file types will not be encrypted:" => "Uvedené typy súborov nebudú kryptované:",
+"Exclude the following file types from encryption:" => "Nekryptovať uvedené typy súborov",
 "None" => "Žiadne"
 );
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index c3f92dc66eb..e5294974e4e 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -5,5 +5,8 @@
 "Please check your passwords and try again." => "Kontrollera dina lösenord och försök igen.",
 "Could not change your file encryption password to your login password" => "Kunde inte ändra ditt filkrypteringslösenord till ditt loginlösenord",
 "Encryption" => "Kryptering",
+"File encryption is enabled." => "Filkryptering är aktiverat.",
+"The following file types will not be encrypted:" => "Följande filtyper kommer inte att krypteras:",
+"Exclude the following file types from encryption:" => "Exkludera följande filtyper från kryptering:",
 "None" => "Ingen"
 );
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index e3ffacabc9a..c7a414c5080 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -4,8 +4,8 @@
  * ownCloud

  *

  * @author Sam Tuke, Frank Karlitschek, Robin Appelman

- * @copyright 2012 Sam Tuke samtuke@owncloud.com, 

- * Robin Appelman icewind@owncloud.com, Frank Karlitschek 

+ * @copyright 2012 Sam Tuke samtuke@owncloud.com,

+ * Robin Appelman icewind@owncloud.com, Frank Karlitschek

  * frank@owncloud.org

  *

  * This library is free software; you can redistribute it and/or

@@ -45,35 +45,17 @@ class Crypt {
 	 * @return string 'client' or 'server'

 	 */

 	public static function mode( $user = null ) {

-		

-// 		$mode = \OC_Appconfig::getValue( 'files_encryption', 'mode', 'none' );

-// 

-// 		if ( $mode == 'user') {

-// 			if ( !$user ) {

-// 				$user = \OCP\User::getUser();

-// 			}

-// 			$mode = 'none';

-// 			if ( $user ) {

-// 				$query = \OC_DB::prepare( "SELECT mode FROM *PREFIX*encryption WHERE uid = ?" );

-// 				$result = $query->execute(array($user));

-// 				if ($row = $result->fetchRow()){

-// 					$mode = $row['mode'];

-// 				}

-// 			}

-// 		}

-// 		

-// 		return $mode;

 

 		return 'server';

-		

+

 	}

-	

-        /**

-         * @brief Create a new encryption keypair

-         * @return array publicKey, privatekey

-         */

+

+	/**

+	 * @brief Create a new encryption keypair

+	 * @return array publicKey, privatekey

+	 */

 	public static function createKeypair() {

-		

+

 		$res = openssl_pkey_new();

 

 		// Get private key

@@ -81,576 +63,543 @@ class Crypt {
 

 		// Get public key

 		$publicKey = openssl_pkey_get_details( $res );

-		

+

 		$publicKey = $publicKey['key'];

-		

+

 		return( array( 'publicKey' => $publicKey, 'privateKey' => $privateKey ) );

-	

+

 	}

-	

-        /**

-         * @brief Add arbitrary padding to encrypted data

-         * @param string $data data to be padded

-         * @return padded data

-         * @note In order to end up with data exactly 8192 bytes long we must 

-         * add two letters. It is impossible to achieve exactly 8192 length 

-         * blocks with encryption alone, hence padding is added to achieve the 

-         * required length. 

-         */

+

+	/**

+	 * @brief Add arbitrary padding to encrypted data

+	 * @param string $data data to be padded

+	 * @return padded data

+	 * @note In order to end up with data exactly 8192 bytes long we must

+	 * add two letters. It is impossible to achieve exactly 8192 length

+	 * blocks with encryption alone, hence padding is added to achieve the

+	 * required length.

+	 */

 	public static function addPadding( $data ) {

-	

+

 		$padded = $data . 'xx';

-		

+

 		return $padded;

-	

+

 	}

-	

-        /**

-         * @brief Remove arbitrary padding to encrypted data

-         * @param string $padded padded data to remove padding from

-         * @return unpadded data on success, false on error

-         */

+

+	/**

+	 * @brief Remove arbitrary padding to encrypted data

+	 * @param string $padded padded data to remove padding from

+	 * @return unpadded data on success, false on error

+	 */

 	public static function removePadding( $padded ) {

-	

+

 		if ( substr( $padded, -2 ) == 'xx' ) {

-	

+

 			$data = substr( $padded, 0, -2 );

-			

+

 			return $data;

-		

+

 		} else {

-		

+

 			// TODO: log the fact that unpadded data was submitted for removal of padding

 			return false;

-			

+

 		}

-	

+

 	}

-	

-        /**

-         * @brief Check if a file's contents contains an IV and is symmetrically encrypted

-         * @return true / false

-         * @note see also OCA\Encryption\Util->isEncryptedPath()

-         */

+

+	/**

+	 * @brief Check if a file's contents contains an IV and is symmetrically encrypted

+	 * @return true / false

+	 * @note see also OCA\Encryption\Util->isEncryptedPath()

+	 */

 	public static function isCatfile( $content ) {

-	

+

 		if ( !$content ) {

-		

+

 			return false;

-			

+

 		}

-		

+

 		$noPadding = self::removePadding( $content );

-		

+

 		// Fetch encryption metadata from end of file

 		$meta = substr( $noPadding, -22 );

-		

+

 		// Fetch IV from end of file

 		$iv = substr( $meta, -16 );

-		

+

 		// Fetch identifier from start of metadata

 		$identifier = substr( $meta, 0, 6 );

-		

+

 		if ( $identifier == '00iv00') {

-		

+

 			return true;

-			

+

 		} else {

-		

+

 			return false;

-			

+

 		}

-	

+

 	}

-	

+

 	/**

 	 * Check if a file is encrypted according to database file cache

 	 * @param string $path

 	 * @return bool

 	 */

 	public static function isEncryptedMeta( $path ) {

-	

+

 		// TODO: Use DI to get \OC\Files\Filesystem out of here

-	

+

 		// Fetch all file metadata from DB

 		$metadata = \OC\Files\Filesystem::getFileInfo( $path, '' );

-		

+

 		// Return encryption status

 		return isset( $metadata['encrypted'] ) and ( bool )$metadata['encrypted'];

-	

+

 	}

-	

-        /**

-         * @brief Check if a file is encrypted via legacy system

-         * @param string $relPath The path of the file, relative to user/data;

-         *        e.g. filename or /Docs/filename, NOT admin/files/filename

-         * @return true / false

-         */

+

+	/**

+	 * @brief Check if a file is encrypted via legacy system

+	 * @param string $relPath The path of the file, relative to user/data;

+	 *        e.g. filename or /Docs/filename, NOT admin/files/filename

+	 * @return true / false

+	 */

 	public static function isLegacyEncryptedContent( $data, $relPath ) {

-	

+

 		// Fetch all file metadata from DB

 		$metadata = \OC\Files\Filesystem::getFileInfo( $relPath, '' );

-		

+

 		// If a file is flagged with encryption in DB, but isn't a 

 		// valid content + IV combination, it's probably using the 

 		// legacy encryption system

-		if ( 

-			isset( $metadata['encrypted'] ) 

-			and $metadata['encrypted'] === true 

-			and ! self::isCatfile( $data ) 

+		if (

+			isset( $metadata['encrypted'] )

+			and $metadata['encrypted'] === true

+			and ! self::isCatfile( $data )

 		) {

-		

+

 			return true;

-		

+

 		} else {

-		

+

 			return false;

-			

+

 		}

-	

+

 	}

-	

-        /**

-         * @brief Symmetrically encrypt a string

-         * @returns encrypted file

-         */

+

+	/**

+	 * @brief Symmetrically encrypt a string

+	 * @returns encrypted file

+	 */

 	public static function encrypt( $plainContent, $iv, $passphrase = '' ) {

-		

+

 		if ( $encryptedContent = openssl_encrypt( $plainContent, 'AES-128-CFB', $passphrase, false, $iv ) ) {

 

 			return $encryptedContent;

-			

+

 		} else {

-		

+

 			\OC_Log::write( 'Encryption library', 'Encryption (symmetric) of content failed', \OC_Log::ERROR );

-			

+

 			return false;

-			

+

 		}

-	

+

 	}

-	

-        /**

-         * @brief Symmetrically decrypt a string

-         * @returns decrypted file

-         */

+

+	/**

+	 * @brief Symmetrically decrypt a string

+	 * @returns decrypted file

+	 */

 	public static function decrypt( $encryptedContent, $iv, $passphrase ) {

-	

+

 		if ( $plainContent = openssl_decrypt( $encryptedContent, 'AES-128-CFB', $passphrase, false, $iv ) ) {

 

 			return $plainContent;

-		

-			

+

+

 		} else {

-		

+

 			throw new \Exception( 'Encryption library: Decryption (symmetric) of content failed' );

-			

-			return false;

-			

+

 		}

-	

+

 	}

-	

-        /**

-         * @brief Concatenate encrypted data with its IV and padding

-         * @param string $content content to be concatenated

-         * @param string $iv IV to be concatenated

-         * @returns string concatenated content

-         */

+

+	/**

+	 * @brief Concatenate encrypted data with its IV and padding

+	 * @param string $content content to be concatenated

+	 * @param string $iv IV to be concatenated

+	 * @returns string concatenated content

+	 */

 	public static function concatIv ( $content, $iv ) {

-	

+

 		$combined = $content . '00iv00' . $iv;

-		

+

 		return $combined;

-	

+

 	}

-	

-        /**

-         * @brief Split concatenated data and IV into respective parts

-         * @param string $catFile concatenated data to be split

-         * @returns array keys: encrypted, iv

-         */

+

+	/**

+	 * @brief Split concatenated data and IV into respective parts

+	 * @param string $catFile concatenated data to be split

+	 * @returns array keys: encrypted, iv

+	 */

 	public static function splitIv ( $catFile ) {

-	

+

 		// Fetch encryption metadata from end of file

 		$meta = substr( $catFile, -22 );

-		

+

 		// Fetch IV from end of file

 		$iv = substr( $meta, -16 );

-		

+

 		// Remove IV and IV identifier text to expose encrypted content

 		$encrypted = substr( $catFile, 0, -22 );

-	

+

 		$split = array(

 			'encrypted' => $encrypted

-			, 'iv' => $iv

+		, 'iv' => $iv

 		);

-		

+

 		return $split;

-	

+

 	}

-	

-        /**

-         * @brief Symmetrically encrypts a string and returns keyfile content

-         * @param $plainContent content to be encrypted in keyfile

-         * @returns encrypted content combined with IV

-         * @note IV need not be specified, as it will be stored in the returned keyfile

-         * and remain accessible therein.

-         */

+

+	/**

+	 * @brief Symmetrically encrypts a string and returns keyfile content

+	 * @param $plainContent content to be encrypted in keyfile

+	 * @returns encrypted content combined with IV

+	 * @note IV need not be specified, as it will be stored in the returned keyfile

+	 * and remain accessible therein.

+	 */

 	public static function symmetricEncryptFileContent( $plainContent, $passphrase = '' ) {

-		

+

 		if ( !$plainContent ) {

-		

+

 			return false;

-			

+

 		}

-		

+

 		$iv = self::generateIv();

-		

+

 		if ( $encryptedContent = self::encrypt( $plainContent, $iv, $passphrase ) ) {

-			

-				// Combine content to encrypt with IV identifier and actual IV

-				$catfile = self::concatIv( $encryptedContent, $iv );

-				

-				$padded = self::addPadding( $catfile );

-				

-				return $padded;

-		

+

+			// Combine content to encrypt with IV identifier and actual IV

+			$catfile = self::concatIv( $encryptedContent, $iv );

+

+			$padded = self::addPadding( $catfile );

+

+			return $padded;

+

 		} else {

-		

+

 			\OC_Log::write( 'Encryption library', 'Encryption (symmetric) of keyfile content failed', \OC_Log::ERROR );

-			

+

 			return false;

-			

+

 		}

-		

+

 	}

 

 

 	/**

-	* @brief Symmetrically decrypts keyfile content

-	* @param string $source

-	* @param string $target

-	* @param string $key the decryption key

-	* @returns decrypted content

-	*

-	* This function decrypts a file

-	*/

+	 * @brief Symmetrically decrypts keyfile content

+	 * @param string $source

+	 * @param string $target

+	 * @param string $key the decryption key

+	 * @returns decrypted content

+	 *

+	 * This function decrypts a file

+	 */

 	public static function symmetricDecryptFileContent( $keyfileContent, $passphrase = '' ) {

-	

+

 		if ( !$keyfileContent ) {

-		

+

 			throw new \Exception( 'Encryption library: no data provided for decryption' );

-			

+

 		}

-		

+

 		// Remove padding

 		$noPadding = self::removePadding( $keyfileContent );

-		

+

 		// Split into enc data and catfile

 		$catfile = self::splitIv( $noPadding );

-		

+

 		if ( $plainContent = self::decrypt( $catfile['encrypted'], $catfile['iv'], $passphrase ) ) {

-		

+

 			return $plainContent;

-			

+

 		}

-	

+

 	}

-	

+

 	/**

-	* @brief Creates symmetric keyfile content using a generated key

-	* @param string $plainContent content to be encrypted

-	* @returns array keys: key, encrypted

-	* @note symmetricDecryptFileContent() can be used to decrypt files created using this method

-	*

-	* This function decrypts a file

-	*/

+	 * @brief Creates symmetric keyfile content using a generated key

+	 * @param string $plainContent content to be encrypted

+	 * @returns array keys: key, encrypted

+	 * @note symmetricDecryptFileContent() can be used to decrypt files created using this method

+	 *

+	 * This function decrypts a file

+	 */

 	public static function symmetricEncryptFileContentKeyfile( $plainContent ) {

-	

+

 		$key = self::generateKey();

-	

+

 		if( $encryptedContent = self::symmetricEncryptFileContent( $plainContent, $key ) ) {

-		

+

 			return array(

 				'key' => $key

-				, 'encrypted' => $encryptedContent

+			, 'encrypted' => $encryptedContent

 			);

-		

+

 		} else {

-		

+

 			return false;

-			

+

 		}

-	

+

 	}

-	

+

 	/**

-	* @brief Create asymmetrically encrypted keyfile content using a generated key

-	* @param string $plainContent content to be encrypted

-	* @returns array keys: key, encrypted

-	* @note symmetricDecryptFileContent() can be used to decrypt files created using this method

-	*

-	* This function decrypts a file

-	*/

+	 * @brief Create asymmetrically encrypted keyfile content using a generated key

+	 * @param string $plainContent content to be encrypted

+	 * @returns array keys: key, encrypted

+	 * @note symmetricDecryptFileContent() can be used to decrypt files created using this method

+	 *

+	 * This function decrypts a file

+	 */

 	public static function multiKeyEncrypt( $plainContent, array $publicKeys ) {

-	

+

 		// Set empty vars to be set by openssl by reference

 		$sealed = '';

 		$envKeys = array();

-	

+

 		if( openssl_seal( $plainContent, $sealed, $envKeys, $publicKeys ) ) {

-		

+

 			return array(

 				'keys' => $envKeys

-				, 'encrypted' => $sealed

+			, 'encrypted' => $sealed

 			);

-		

+

 		} else {

-		

+

 			return false;

-			

+

 		}

-	

+

 	}

-	

+

 	/**

-	* @brief Asymmetrically encrypt a file using multiple public keys

-	* @param string $plainContent content to be encrypted

-	* @returns string $plainContent decrypted string

-	* @note symmetricDecryptFileContent() can be used to decrypt files created using this method

-	*

-	* This function decrypts a file

-	*/

+	 * @brief Asymmetrically encrypt a file using multiple public keys

+	 * @param string $plainContent content to be encrypted

+	 * @returns string $plainContent decrypted string

+	 * @note symmetricDecryptFileContent() can be used to decrypt files created using this method

+	 *

+	 * This function decrypts a file

+	 */

 	public static function multiKeyDecrypt( $encryptedContent, $envKey, $privateKey ) {

-	

+

 		if ( !$encryptedContent ) {

-		

+

 			return false;

-			

+

 		}

-		

+

 		if ( openssl_open( $encryptedContent, $plainContent, $envKey, $privateKey ) ) {

-		

+

 			return $plainContent;

-			

+

 		} else {

-		

+

 			\OC_Log::write( 'Encryption library', 'Decryption (asymmetric) of sealed content failed', \OC_Log::ERROR );

-			

+

 			return false;

-			

+

 		}

-	

+

 	}

-	

-        /**

-         * @brief Asymetrically encrypt a string using a public key

-         * @returns encrypted file

-         */

+

+	/**

+	 * @brief Asymmetrically encrypt a string using a public key

+	 * @returns encrypted file

+	 */

 	public static function keyEncrypt( $plainContent, $publicKey ) {

-	

+

 		openssl_public_encrypt( $plainContent, $encryptedContent, $publicKey );

-		

+

 		return $encryptedContent;

-	

+

 	}

-	

-        /**

-         * @brief Asymetrically decrypt a file using a private key

-         * @returns decrypted file

-         */

+

+	/**

+	 * @brief Asymetrically decrypt a file using a private key

+	 * @returns decrypted file

+	 */

 	public static function keyDecrypt( $encryptedContent, $privatekey ) {

-	

+

 		openssl_private_decrypt( $encryptedContent, $plainContent, $privatekey );

-		

+

 		return $plainContent;

-	

+

 	}

 

-        /**

-         * @brief Encrypts content symmetrically and generates keyfile asymmetrically

-         * @returns array containing catfile and new keyfile. 

-         * keys: data, key

-         * @note this method is a wrapper for combining other crypt class methods

-         */

+	/**

+	 * @brief Encrypts content symmetrically and generates keyfile asymmetrically

+	 * @returns array containing catfile and new keyfile.

+	 * keys: data, key

+	 * @note this method is a wrapper for combining other crypt class methods

+	 */

 	public static function keyEncryptKeyfile( $plainContent, $publicKey ) {

-		

+

 		// Encrypt plain data, generate keyfile & encrypted file

 		$cryptedData = self::symmetricEncryptFileContentKeyfile( $plainContent );

-		

+

 		// Encrypt keyfile

 		$cryptedKey = self::keyEncrypt( $cryptedData['key'], $publicKey );

-		

+

 		return array( 'data' => $cryptedData['encrypted'], 'key' => $cryptedKey );

-		

+

 	}

-	

-        /**

-         * @brief Takes catfile, keyfile, and private key, and

-         * performs decryption

-         * @returns decrypted content

-         * @note this method is a wrapper for combining other crypt class methods

-         */

+

+	/**

+	 * @brief Takes catfile, keyfile, and private key, and

+	 * performs decryption

+	 * @returns decrypted content

+	 * @note this method is a wrapper for combining other crypt class methods

+	 */

 	public static function keyDecryptKeyfile( $catfile, $keyfile, $privateKey ) {

-		

+

 		// Decrypt the keyfile with the user's private key

 		$decryptedKeyfile = self::keyDecrypt( $keyfile, $privateKey );

-		

+

 		// Decrypt the catfile symmetrically using the decrypted keyfile

 		$decryptedData = self::symmetricDecryptFileContent( $catfile, $decryptedKeyfile );

-		

+

 		return $decryptedData;

-		

+

 	}

-	

+

 	/**

-	* @brief Symmetrically encrypt a file by combining encrypted component data blocks

-	*/

+	 * @brief Symmetrically encrypt a file by combining encrypted component data blocks

+	 */

 	public static function symmetricBlockEncryptFileContent( $plainContent, $key ) {

-	

+

 		$crypted = '';

-		

+

 		$remaining = $plainContent;

-		

+

 		$testarray = array();

-		

+

 		while( strlen( $remaining ) ) {

-		

+

 			//echo "\n\n\$block = ".substr( $remaining, 0, 6126 );

-		

+

 			// Encrypt a chunk of unencrypted data and add it to the rest

 			$block = self::symmetricEncryptFileContent( substr( $remaining, 0, 6126 ), $key );

-			

+

 			$padded = self::addPadding( $block );

-			

+

 			$crypted .= $block;

-			

+

 			$testarray[] = $block;

-			

+

 			// Remove the data already encrypted from remaining unencrypted data

 			$remaining = substr( $remaining, 6126 );

-		

+

 		}

-		

-		//echo "hags   ";

-		

-		//echo "\n\n\n\$crypted = $crypted\n\n\n";

-		

-		//print_r($testarray);

-		

+

 		return $crypted;

 

 	}

 

 

 	/**

-	* @brief Symmetrically decrypt a file by combining encrypted component data blocks

-	*/

+	 * @brief Symmetrically decrypt a file by combining encrypted component data blocks

+	 */

 	public static function symmetricBlockDecryptFileContent( $crypted, $key ) {

-		

+

 		$decrypted = '';

-		

+

 		$remaining = $crypted;

-		

+

 		$testarray = array();

-		

+

 		while( strlen( $remaining ) ) {

-			

+

 			$testarray[] = substr( $remaining, 0, 8192 );

-		

+

 			// Decrypt a chunk of unencrypted data and add it to the rest

 			$decrypted .= self::symmetricDecryptFileContent( $remaining, $key );

-			

+

 			// Remove the data already encrypted from remaining unencrypted data

 			$remaining = substr( $remaining, 8192 );

-			

+

 		}

-		

-		//echo "\n\n\$testarray = "; print_r($testarray);

-		

+

 		return $decrypted;

-		

+

 	}

-	

-        /**

-         * @brief Generates a pseudo random initialisation vector

-         * @return String $iv generated IV

-         */

+

+	/**

+	 * @brief Generates a pseudo random initialisation vector

+	 * @return String $iv generated IV

+	 */

 	public static function generateIv() {

-		

+

 		if ( $random = openssl_random_pseudo_bytes( 12, $strong ) ) {

-		

+

 			if ( !$strong ) {

-			

+

 				// If OpenSSL indicates randomness is insecure, log error

 				\OC_Log::write( 'Encryption library', 'Insecure symmetric key was generated using openssl_random_pseudo_bytes()', \OC_Log::WARN );

-			

+

 			}

-			

+

 			// We encode the iv purely for string manipulation 

 			// purposes - it gets decoded before use

 			$iv = base64_encode( $random );

-			

+

 			return $iv;

-			

+

 		} else {

-		

-			throw new Exception( 'Generating IV failed' );

-			

+

+			throw new \Exception( 'Generating IV failed' );

+

 		}

-		

+

 	}

-	

-        /**

-         * @brief Generate a pseudo random 1024kb ASCII key

-         * @returns $key Generated key

-         */

+

+	/**

+	 * @brief Generate a pseudo random 1024kb ASCII key

+	 * @returns $key Generated key

+	 */

 	public static function generateKey() {

-		

+

 		// Generate key

 		if ( $key = base64_encode( openssl_random_pseudo_bytes( 183, $strong ) ) ) {

-		

+

 			if ( !$strong ) {

-			

+

 				// If OpenSSL indicates randomness is insecure, log error

-				throw new Exception ( 'Encryption library, Insecure symmetric key was generated using openssl_random_pseudo_bytes()' );

-			

+				throw new \Exception ( 'Encryption library, Insecure symmetric key was generated using openssl_random_pseudo_bytes()' );

+

 			}

-		

+

 			return $key;

-			

+

 		} else {

-		

+

 			return false;

-			

-		}

-		

-	}

 

-	public static function changekeypasscode( $oldPassword, $newPassword ) {

-

-		if ( \OCP\User::isLoggedIn() ) {

-		

-			$key = Keymanager::getPrivateKey( $user, $view );

-			

-			if ( ( $key = Crypt::symmetricDecryptFileContent($key,$oldpasswd) ) ) {

-			

-				if ( ( $key = Crypt::symmetricEncryptFileContent( $key, $newpasswd ) ) ) {

-				

-					Keymanager::setPrivateKey( $key );

-					

-					return true;

-				}

-				

-			}

-			

 		}

-		

-		return false;

-		

+

 	}

-	

+

 	/**

 	 * @brief Get the blowfish encryption handeler for a key

 	 * @param $key string (optional)

@@ -659,21 +608,21 @@ class Crypt {
 	 * if the key is left out, the default handeler will be used

 	 */

 	public static function getBlowfish( $key = '' ) {

-	

+

 		if ( $key ) {

-		

+

 			return new \Crypt_Blowfish( $key );

-		

+

 		} else {

-		

+

 			return false;

-			

+

 		}

-		

+

 	}

-	

+

 	public static function legacyCreateKey( $passphrase ) {

-	

+

 		// Generate a random integer

 		$key = mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 );

 

@@ -681,9 +630,9 @@ class Crypt {
 		$legacyEncKey = self::legacyEncrypt( $key, $passphrase );

 

 		return $legacyEncKey;

-	

+

 	}

-	

+

 	/**

 	 * @brief encrypts content using legacy blowfish system

 	 * @param $content the cleartext message you want to encrypt

@@ -693,54 +642,54 @@ class Crypt {
 	 * This function encrypts an content

 	 */

 	public static function legacyEncrypt( $content, $passphrase = '' ) {

-	

+

 		$bf = self::getBlowfish( $passphrase );

-		

+

 		return $bf->encrypt( $content );

-		

+

 	}

-	

+

 	/**

-	* @brief decrypts content using legacy blowfish system

-	* @param $content the cleartext message you want to decrypt

-	* @param $key the encryption key (optional)

-	* @returns cleartext content

-	*

-	* This function decrypts an content

-	*/

+	 * @brief decrypts content using legacy blowfish system

+	 * @param $content the cleartext message you want to decrypt

+	 * @param $key the encryption key (optional)

+	 * @returns cleartext content

+	 *

+	 * This function decrypts an content

+	 */

 	public static function legacyDecrypt( $content, $passphrase = '' ) {

-		

+

 		$bf = self::getBlowfish( $passphrase );

-		

+

 		$decrypted = $bf->decrypt( $content );

-		

+

 		$trimmed = rtrim( $decrypted, "\0" );

-		

+

 		return $trimmed;

-		

+

 	}

-	

+

 	public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKey, $newPassphrase ) {

-	

+

 		$decrypted = self::legacyDecrypt( $legacyEncryptedContent, $legacyPassphrase );

-	

+

 		$recrypted = self::keyEncryptKeyfile( $decrypted, $publicKey );

-		

+

 		return $recrypted;

-	

+

 	}

-	

+

 	/**

-	* @brief Re-encryptes a legacy blowfish encrypted file using AES with integrated IV

-	* @param $legacyContent the legacy encrypted content to re-encrypt

-	* @returns cleartext content

-	*

-	* This function decrypts an content

-	*/

+	 * @brief Re-encryptes a legacy blowfish encrypted file using AES with integrated IV

+	 * @param $legacyContent the legacy encrypted content to re-encrypt

+	 * @returns cleartext content

+	 *

+	 * This function decrypts an content

+	 */

 	public static function legacyRecrypt( $legacyContent, $legacyPassphrase, $newPassphrase ) {

-		

+

 		// TODO: write me

-	

+

 	}

-	

+

 }
\ No newline at end of file
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 43af70dacc2..95587797154 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -1,325 +1,323 @@
-<?php

-

-/**

- * ownCloud

- *

- * @author Bjoern Schiessle

- * @copyright 2012 Bjoern Schiessle <schiessle@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/>.

- *

- */

-

-namespace OCA\Encryption;

-

-/**

- * @brief Class to manage storage and retrieval of encryption keys

- * @note Where a method requires a view object, it's root must be '/'

- */

-class Keymanager {

-		

-	/**

-	 * @brief retrieve the ENCRYPTED private key from a user

-	 * 

-	 * @return string private key or false

-	 * @note the key returned by this method must be decrypted before use

-	 */

-	public static function getPrivateKey( \OC_FilesystemView $view, $user ) {

-	

-		$path =  '/' . $user . '/' . 'files_encryption' . '/' . $user.'.private.key';

-		

-		$key = $view->file_get_contents( $path );

-		

-		return $key;

-	}

-

-	/**

-	 * @brief retrieve public key for a specified user

-	 * @return string public key or false

-	 */

-	public static function getPublicKey( \OC_FilesystemView $view, $userId ) {

-		

-		return $view->file_get_contents( '/public-keys/' . '/' . $userId . '.public.key' );

-		

-	}

-	

-	/**

-	 * @brief retrieve both keys from a user (private and public)

-	 * @return array keys: privateKey, publicKey

-	 */

-	public static function getUserKeys( \OC_FilesystemView $view, $userId ) {

-	

-		return array(

-			'publicKey' => self::getPublicKey( $view, $userId )

-			, 'privateKey' => self::getPrivateKey( $view, $userId )

-		);

-	

-	}

-	

-	/**

-	 * @brief Retrieve public keys of all users with access to a file

-	 * @param string $path Path to file

-	 * @return array of public keys for the given file

-	 * @note Checks that the sharing app is enabled should be performed 

-	 * by client code, that isn't checked here

-	 */

-	public static function getPublicKeys( \OC_FilesystemView $view, $userId, $filePath ) {

-		

-		$path = ltrim( $path, '/' );

-		

-		$filepath = '/' . $userId . '/files/' . $filePath;

-		

-		// Check if sharing is enabled

-		if ( OC_App::isEnabled( 'files_sharing' ) ) {

-			

-

-		

-		} else {

-		

-			// check if it is a file owned by the user and not shared at all

-			$userview = new \OC_FilesystemView( '/'.$userId.'/files/' );

-			

-			if ( $userview->file_exists( $path ) ) {

-			

-				$users[] = $userId;

-				

-			}

-			

-		}

-		

-		$view = new \OC_FilesystemView( '/public-keys/' );

-		

-		$keylist = array();

-		

-		$count = 0;

-		

-		foreach ( $users as $user ) {

-		

-			$keylist['key'.++$count] = $view->file_get_contents( $user.'.public.key' );

-			

-		}

-		

-		return $keylist;

-		

-	}

-	

-	/**

-	 * @brief store file encryption key

-	 *

-	 * @param string $path relative path of the file, including filename

-	 * @param string $key

-	 * @return bool true/false

-	 * @note The keyfile is not encrypted here. Client code must 

-	 * asymmetrically encrypt the keyfile before passing it to this method

-	 */

-	public static function setFileKey( \OC_FilesystemView $view, $path, $userId, $catfile ) {

-		

-		$basePath = '/' . $userId . '/files_encryption/keyfiles';

-		

-		$targetPath = self::keySetPreparation( $view, $path, $basePath, $userId );

-		

-		if ( $view->is_dir( $basePath . '/' . $targetPath ) ) {

-		

-			

-		

-		} else {

-

-			// Save the keyfile in parallel directory

-			return $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );

-		

-		}

-		

-	}

-	

-	/**

-	 * @brief retrieve keyfile for an encrypted file

-	 * @param string file name

-	 * @return string file key or false on failure

-	 * @note The keyfile returned is asymmetrically encrypted. Decryption

-	 * of the keyfile must be performed by client code

-	 */

-	public static function getFileKey( \OC_FilesystemView $view, $userId, $filePath ) {

-		

-		$filePath_f = ltrim( $filePath, '/' );

-		

-		$catfilePath = '/' . $userId . '/files_encryption/keyfiles/' . $filePath_f . '.key';

-		

-		if ( $view->file_exists( $catfilePath ) ) {

-

-			return $view->file_get_contents( $catfilePath );

-			

-		} else {

-		

-			return false;

-			

-		}

-		

-	}

-	

-	/**

-	 * @brief Delete a keyfile

-	 *

-	 * @param OC_FilesystemView $view

-	 * @param string $userId username

-	 * @param string $path path of the file the key belongs to

-	 * @return bool Outcome of unlink operation

-	 * @note $path must be relative to data/user/files. e.g. mydoc.txt NOT

-	 *       /data/admin/files/mydoc.txt

-	 */

-	public static function deleteFileKey( \OC_FilesystemView $view, $userId, $path ) {

-		

-		$trimmed = ltrim( $path, '/' );

-		$keyPath =  '/' . $userId . '/files_encryption/keyfiles/' . $trimmed . '.key';

-		

-		// Unlink doesn't tell us if file was deleted (not found returns

-		// true), so we perform our own test

-		if ( $view->file_exists( $keyPath ) ) {

-		

-			return $view->unlink( $keyPath );

-			

-		} else {

-			

-			\OC_Log::write( 'Encryption library', 'Could not delete keyfile; does not exist: "' . $keyPath, \OC_Log::ERROR );

-			

-			return false;

-			

-		}

-		

-	}

-	

-	/**

-	 * @brief store private key from the user

-	 * @param string key

-	 * @return bool

-	 * @note Encryption of the private key must be performed by client code

-	 * as no encryption takes place here

-	 */

-	public static function setPrivateKey( $key ) {

-		

-		$user = \OCP\User::getUser();

-		

-		$view = new \OC_FilesystemView( '/' . $user . '/files_encryption' );

-		

-		\OC_FileProxy::$enabled = false;

-		

-		if ( !$view->file_exists( '' ) ) $view->mkdir( '' );

-		

-		return $view->file_put_contents( $user . '.private.key', $key );

-		

-		\OC_FileProxy::$enabled = true;

-		

-	}

-	

-	/**

-	 * @brief store private keys from the user

-	 *

-	 * @param string privatekey

-	 * @param string publickey

-	 * @return bool true/false

-	 */

-	public static function setUserKeys($privatekey, $publickey) {

-	

-		return ( self::setPrivateKey( $privatekey ) && self::setPublicKey( $publickey ) );

-	

-	}

-	

-	/**

-	 * @brief store public key of the user

-	 *

-	 * @param string key

-	 * @return bool true/false

-	 */

-	public static function setPublicKey( $key ) {

-		

-		$view = new \OC_FilesystemView( '/public-keys' );

-		

-		\OC_FileProxy::$enabled = false;

-		

-		if ( !$view->file_exists( '' ) ) $view->mkdir( '' );

-		

-		return $view->file_put_contents( \OCP\User::getUser() . '.public.key', $key );

-		

-		\OC_FileProxy::$enabled = true;

-		

-	}

-	

-	/**

-	 * @note 'shareKey' is a more user-friendly name for env_key

-	 */

-	public static function setShareKey( \OC_FilesystemView $view, $path, $userId, $shareKey ) {

-		

-		$basePath = '/' . $userId . '/files_encryption/share-keys';

-		

-		$shareKeyPath = self::keySetPreparation( $view, $path, $basePath, $userId );

-		

-		return $view->file_put_contents( $basePath . '/' . $shareKeyPath . '.shareKey', $shareKey );

-		

-	}

-	

-	/**

-	 * @brief Make preparations to vars and filesystem for saving a keyfile

-	 */

-	public static function keySetPreparation( \OC_FilesystemView $view, $path, $basePath, $userId ) {

-		

-		$targetPath = ltrim( $path, '/' );

-		

-		$path_parts = pathinfo( $targetPath );

-		

-		// If the file resides within a subdirectory, create it

-		if ( 

-		isset( $path_parts['dirname'] )

-		&& ! $view->file_exists( $basePath . '/' . $path_parts['dirname'] ) 

-		) {

-		

-			$view->mkdir( $basePath . '/' . $path_parts['dirname'] );

-			

-		}

-		

-		return $targetPath;

-	

-	}

-	

-	/**

-	 * @brief change password of private encryption key

-	 *

-	 * @param string $oldpasswd old password

-	 * @param string $newpasswd new password

-	 * @return bool true/false

-	 */

-	public static function changePasswd($oldpasswd, $newpasswd) {

-		

-		if ( \OCP\User::checkPassword(\OCP\User::getUser(), $newpasswd) ) {

-			return Crypt::changekeypasscode($oldpasswd, $newpasswd);

-		}

-		return false;

-		

-	}

-	

-	/**

-	 * @brief Fetch the legacy encryption key from user files

-	 * @param string $login used to locate the legacy key

-	 * @param string $passphrase used to decrypt the legacy key

-	 * @return true / false

-	 *

-	 * if the key is left out, the default handeler will be used

-	 */

-	public function getLegacyKey() {

-		

-		$user = \OCP\User::getUser();

-		$view = new \OC_FilesystemView( '/' . $user );

-		return $view->file_get_contents( 'encryption.key' );

-		

-	}

-	

+<?php
+
+/**
+ * ownCloud
+ *
+ * @author Bjoern Schiessle
+ * @copyright 2012 Bjoern Schiessle <schiessle@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/>.
+ *
+ */
+
+namespace OCA\Encryption;
+
+/**
+ * @brief Class to manage storage and retrieval of encryption keys
+ * @note Where a method requires a view object, it's root must be '/'
+ */
+class Keymanager {
+		
+	/**
+	 * @brief retrieve the ENCRYPTED private key from a user
+	 * 
+	 * @return string private key or false
+	 * @note the key returned by this method must be decrypted before use
+	 */
+	public static function getPrivateKey( \OC_FilesystemView $view, $user ) {
+	
+		$path =  '/' . $user . '/' . 'files_encryption' . '/' . $user.'.private.key';
+		
+		$key = $view->file_get_contents( $path );
+		
+		return $key;
+	}
+
+	/**
+	 * @brief retrieve public key for a specified user
+	 * @param \OC_FilesystemView $view
+	 * @param $userId
+	 * @return string public key or false
+	 */
+	public static function getPublicKey( \OC_FilesystemView $view, $userId ) {
+		
+		return $view->file_get_contents( '/public-keys/' . '/' . $userId . '.public.key' );
+		
+	}
+	
+	/**
+	 * @brief retrieve both keys from a user (private and public)
+	 * @param \OC_FilesystemView $view
+	 * @param $userId
+	 * @return array keys: privateKey, publicKey
+	 */
+	public static function getUserKeys( \OC_FilesystemView $view, $userId ) {
+	
+		return array(
+			'publicKey' => self::getPublicKey( $view, $userId )
+			, 'privateKey' => self::getPrivateKey( $view, $userId )
+		);
+	
+	}
+	
+	/**
+	 * @brief Retrieve public keys of all users with access to a file
+	 * @param string $path Path to file
+	 * @return array of public keys for the given file
+	 * @note Checks that the sharing app is enabled should be performed 
+	 * by client code, that isn't checked here
+	 */
+	public static function getPublicKeys( \OC_FilesystemView $view, $userId, $filePath ) {
+		
+		$path = ltrim( $path, '/' );
+		
+		$filepath = '/' . $userId . '/files/' . $filePath;
+		
+		// Check if sharing is enabled
+		if ( OC_App::isEnabled( 'files_sharing' ) ) {
+			
+
+		
+		} else {
+		
+			// check if it is a file owned by the user and not shared at all
+			$userview = new \OC_FilesystemView( '/'.$userId.'/files/' );
+			
+			if ( $userview->file_exists( $path ) ) {
+			
+				$users[] = $userId;
+				
+			}
+			
+		}
+		
+		$view = new \OC_FilesystemView( '/public-keys/' );
+		
+		$keylist = array();
+		
+		$count = 0;
+		
+		foreach ( $users as $user ) {
+		
+			$keylist['key'.++$count] = $view->file_get_contents( $user.'.public.key' );
+			
+		}
+		
+		return $keylist;
+		
+	}
+	
+	/**
+	 * @brief store file encryption key
+	 *
+	 * @param string $path relative path of the file, including filename
+	 * @param string $key
+	 * @return bool true/false
+	 * @note The keyfile is not encrypted here. Client code must 
+	 * asymmetrically encrypt the keyfile before passing it to this method
+	 */
+	public static function setFileKey( \OC_FilesystemView $view, $path, $userId, $catfile ) {
+		
+		$basePath = '/' . $userId . '/files_encryption/keyfiles';
+		
+		$targetPath = self::keySetPreparation( $view, $path, $basePath, $userId );
+		
+		if ( $view->is_dir( $basePath . '/' . $targetPath ) ) {
+		
+			
+		
+		} else {
+
+			// Save the keyfile in parallel directory
+			return $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );
+		
+		}
+		
+	}
+	
+	/**
+	 * @brief retrieve keyfile for an encrypted file
+	 * @param \OC_FilesystemView $view
+	 * @param $userId
+	 * @param $filePath
+	 * @internal param \OCA\Encryption\file $string name
+	 * @return string file key or false
+	 * @note The keyfile returned is asymmetrically encrypted. Decryption
+	 * of the keyfile must be performed by client code
+	 */
+	public static function getFileKey( \OC_FilesystemView $view, $userId, $filePath ) {
+		
+		$filePath_f = ltrim( $filePath, '/' );
+		
+		$catfilePath = '/' . $userId . '/files_encryption/keyfiles/' . $filePath_f . '.key';
+		
+		if ( $view->file_exists( $catfilePath ) ) {
+
+			return $view->file_get_contents( $catfilePath );
+			
+		} else {
+		
+			return false;
+			
+		}
+		
+	}
+	
+	/**
+	 * @brief Delete a keyfile
+	 *
+	 * @param OC_FilesystemView $view
+	 * @param string $userId username
+	 * @param string $path path of the file the key belongs to
+	 * @return bool Outcome of unlink operation
+	 * @note $path must be relative to data/user/files. e.g. mydoc.txt NOT
+	 *       /data/admin/files/mydoc.txt
+	 */
+	public static function deleteFileKey( \OC_FilesystemView $view, $userId, $path ) {
+		
+		$trimmed = ltrim( $path, '/' );
+		$keyPath =  '/' . $userId . '/files_encryption/keyfiles/' . $trimmed . '.key';
+		
+		// Unlink doesn't tell us if file was deleted (not found returns
+		// true), so we perform our own test
+		if ( $view->file_exists( $keyPath ) ) {
+		
+			return $view->unlink( $keyPath );
+			
+		} else {
+			
+			\OC_Log::write( 'Encryption library', 'Could not delete keyfile; does not exist: "' . $keyPath, \OC_Log::ERROR );
+			
+			return false;
+			
+		}
+		
+	}
+	
+	/**
+	 * @brief store private key from the user
+	 * @param string key
+	 * @return bool
+	 * @note Encryption of the private key must be performed by client code
+	 * as no encryption takes place here
+	 */
+	public static function setPrivateKey( $key ) {
+		
+		$user = \OCP\User::getUser();
+		
+		$view = new \OC_FilesystemView( '/' . $user . '/files_encryption' );
+		
+		\OC_FileProxy::$enabled = false;
+		
+		if ( !$view->file_exists( '' ) )
+			$view->mkdir( '' );
+		
+		return $view->file_put_contents( $user . '.private.key', $key );
+
+	}
+	
+	/**
+	 * @brief store private keys from the user
+	 *
+	 * @param string privatekey
+	 * @param string publickey
+	 * @return bool true/false
+	 */
+	public static function setUserKeys($privatekey, $publickey) {
+	
+		return ( self::setPrivateKey( $privatekey ) && self::setPublicKey( $publickey ) );
+	
+	}
+	
+	/**
+	 * @brief store public key of the user
+	 *
+	 * @param string key
+	 * @return bool true/false
+	 */
+	public static function setPublicKey( $key ) {
+		
+		$view = new \OC_FilesystemView( '/public-keys' );
+		
+		\OC_FileProxy::$enabled = false;
+		
+		if ( !$view->file_exists( '' ) )
+			$view->mkdir( '' );
+		
+		return $view->file_put_contents( \OCP\User::getUser() . '.public.key', $key );
+
+		
+	}
+	
+	/**
+	 * @brief store file encryption key
+	 *
+	 * @param string $path relative path of the file, including filename
+	 * @param string $key
+	 * @param null $view
+	 * @param string $dbClassName
+	 * @return bool true/false
+	 * @note The keyfile is not encrypted here. Client code must
+	 * asymmetrically encrypt the keyfile before passing it to this method
+	 */
+	public static function setShareKey( \OC_FilesystemView $view, $path, $userId, $shareKey ) {
+		
+		$basePath = '/' . $userId . '/files_encryption/share-keys';
+		
+		$shareKeyPath = self::keySetPreparation( $view, $path, $basePath, $userId );
+		
+		return $view->file_put_contents( $basePath . '/' . $shareKeyPath . '.shareKey', $shareKey );
+		
+	}
+	
+	/**
+	 * @brief Make preparations to vars and filesystem for saving a keyfile
+	 */
+	public static function keySetPreparation( \OC_FilesystemView $view, $path, $basePath, $userId ) {
+		
+		$targetPath = ltrim( $path, '/' );
+		
+		$path_parts = pathinfo( $targetPath );
+		
+		// If the file resides within a subdirectory, create it
+		if ( 
+		isset( $path_parts['dirname'] )
+		&& ! $view->file_exists( $basePath . '/' . $path_parts['dirname'] ) 
+		) {
+		
+			$view->mkdir( $basePath . '/' . $path_parts['dirname'] );
+			
+		}
+		
+		return $targetPath;
+	
+	}
+
+	/**
+	 * @brief Fetch the legacy encryption key from user files
+	 * @param string $login used to locate the legacy key
+	 * @param string $passphrase used to decrypt the legacy key
+	 * @return true / false
+	 *
+	 * if the key is left out, the default handler will be used
+	 */
+	public function getLegacyKey() {
+		
+		$user = \OCP\User::getUser();
+		$view = new \OC_FilesystemView( '/' . $user );
+		return $view->file_get_contents( 'encryption.key' );
+		
+	}
+	
 }
\ No newline at end of file
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index d4b993b4c06..65d7d57a05a 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -173,7 +173,7 @@ class Stream {
 			
 			// $count will always be 8192 https://bugs.php.net/bug.php?id=21641
 			// This makes this function a lot simpler, but will break this class if the above 'bug' gets 'fixed'
-			\OCP\Util::writeLog( 'files_encryption', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', OCP\Util::FATAL );
+			\OCP\Util::writeLog( 'files_encryption', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', \OCP\Util::FATAL );
 
 			die();
 
@@ -209,7 +209,7 @@ class Stream {
 	}
 	
 	/**
-	 * @brief Encrypt and pad data ready for writting to disk
+	 * @brief Encrypt and pad data ready for writing to disk
 	 * @param string $plainData data to be encrypted
 	 * @param string $key key to use for encryption
 	 * @return encrypted data on success, false on failure
@@ -403,7 +403,7 @@ class Stream {
 				$encrypted = $this->preWriteEncrypt( $chunk, $this->keyfile );
 				
 				// Write the data chunk to disk. This will be 
-				// addended to the last data chunk if the file 
+				// attended to the last data chunk if the file
 				// being handled totals more than 6126 bytes
 				fwrite( $this->handle, $encrypted );
 				
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 355ffb90ef0..52bc74db27a 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -69,11 +69,6 @@ class Util {
 	//// DONE: add method to fetch legacy key
 	//// DONE: add method to decrypt legacy encrypted data
 	
-	//// TODO: add method to encrypt all user files using new system
-	//// TODO: add method to decrypt all user files using new system
-	//// TODO: add method to encrypt all user files using old system
-	//// TODO: add method to decrypt all user files using old system
-	
 	
 	// Admin UI:
 	
@@ -93,7 +88,6 @@ class Util {
 	
 	// Integration testing:
 	
-	//// TODO: test new encryption with webdav
 	//// TODO: test new encryption with versioning
 	//// TODO: test new encryption with sharing
 	//// TODO: test new encryption with proxies
@@ -278,7 +272,7 @@ class Util {
 						// will eat server resources :(
 						if ( 
 							Keymanager::getFileKey( $this->view, $this->userId, $file ) 
-							&& Crypt::isCatfile( $filePath )
+							&& Crypt::isCatfile( $data )
 						) {
 						
 							$found['encrypted'][] = array( 'name' => $file, 'path' => $filePath );
@@ -391,7 +385,6 @@ class Util {
 			
 			}
 			
-			// FIXME: Legacy recrypting here isn't finished yet
 			// Encrypt legacy encrypted files
 			if ( 
 				! empty( $legacyPassphrase ) 
@@ -437,6 +430,11 @@ class Util {
 		
 	}
 	
+	/**
+	 * @brief Return important encryption related paths
+	 * @param string $pathName Name of the directory to return the path of
+	 * @return string path
+	 */
 	public function getPath( $pathName ) {
 	
 		switch ( $pathName ) {
diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
index 6fe4ea6d564..af0273cfdc4 100644
--- a/apps/files_encryption/settings-personal.php
+++ b/apps/files_encryption/settings-personal.php
@@ -12,8 +12,6 @@ $blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_b
 

 $tmpl->assign( 'blacklist', $blackList );

 

-OCP\Util::addscript('files_encryption','settings-personal');

-

 return $tmpl->fetchPage();

 

 return null;

diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index 1f71efb1735..47467c52c08 100644
--- a/apps/files_encryption/templates/settings-personal.php
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -16,7 +16,7 @@
 				<?php echo $type; ?>

 			</li>

 			<?php endforeach; ?>

-		</p>

+		</ul>

 		<?php endif; ?>

 	</fieldset>

 </form>

diff --git a/apps/files_sharing/l10n/sr.php b/apps/files_sharing/l10n/sr.php
index 2eb61a738e3..6e277f67711 100644
--- a/apps/files_sharing/l10n/sr.php
+++ b/apps/files_sharing/l10n/sr.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Лозинка",
-"Submit" => "Пошаљи"
+"Submit" => "Пошаљи",
+"Download" => "Преузми"
 );
diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php
new file mode 100644
index 00000000000..7a6bd1342ea
--- /dev/null
+++ b/apps/files_trashbin/ajax/delete.php
@@ -0,0 +1,24 @@
+<?php
+
+OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
+
+$file = $_REQUEST['file'];
+
+$path_parts = pathinfo($file);
+if ($path_parts['dirname'] == '.') {
+	$delimiter = strrpos($file, '.d');
+	$filename = substr($file, 0, $delimiter);
+	$timestamp =  substr($file, $delimiter+2);
+} else {
+	$filename = $file;
+	$timestamp = null;
+}
+
+if (OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp)) {
+	OCP\JSON::success(array("data" => array("filename" => $file)));
+} else {
+	$l = OC_L10N::get('files_trashbin');
+	OCP\JSON::error(array("data" => array("message" => $l->t("Couldn't delete %s permanently", array($file)))));
+}
+
diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php
index ee1c64aaaf2..cc010979c51 100644
--- a/apps/files_trashbin/ajax/undelete.php
+++ b/apps/files_trashbin/ajax/undelete.php
@@ -22,7 +22,7 @@ foreach ($list as $file) {
 		$timestamp = null;
 	}
 	
-	if ( !OCA_Trash\Trashbin::restore($file, $filename, $timestamp) ) {
+	if ( !OCA\Files_Trashbin\Trashbin::restore($file, $filename, $timestamp) ) {
 		$error[] = $filename;
 	} else {
 		$success[$i]['filename'] = $file;
@@ -37,8 +37,10 @@ if ( $error ) {
 	foreach ( $error as $e ) {
 		$filelist .= $e.', ';
 	}
-	OCP\JSON::error(array("data" => array("message" => "Couldn't restore ".rtrim($filelist,', '), "success" => $success, "error" => $error)));
+	$l = OC_L10N::get('files_trashbin');
+	$message = $l->t("Couldn't restore %s", array(rtrim($filelist,', ')));
+	OCP\JSON::error(array("data" => array("message" => $message,
+										  "success" => $success, "error" => $error)));
 } else {
 	OCP\JSON::success(array("data" => array("success" => $success)));
 }
-
diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php
index 3741d42c781..b1a15cd13d1 100644
--- a/apps/files_trashbin/appinfo/app.php
+++ b/apps/files_trashbin/appinfo/app.php
@@ -1,7 +1,7 @@
 <?php
 
-OC::$CLASSPATH['OCA_Trash\Hooks'] = 'apps/files_trashbin/lib/hooks.php';

-OC::$CLASSPATH['OCA_Trash\Trashbin'] = 'apps/files_trashbin/lib/trash.php';

+OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'apps/files_trashbin/lib/hooks.php';

+OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'apps/files_trashbin/lib/trash.php';

 
 

-OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA_Trash\Hooks", "remove_hook");
+OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Files_Trashbin\Hooks", "remove_hook");
diff --git a/apps/files_trashbin/js/disableDefaultActions.js b/apps/files_trashbin/js/disableDefaultActions.js
index 56b95407dd3..27c3e13db4d 100644
--- a/apps/files_trashbin/js/disableDefaultActions.js
+++ b/apps/files_trashbin/js/disableDefaultActions.js
@@ -1,3 +1,4 @@
 /* disable download and sharing actions */

 var disableDownloadActions = true;

 var disableSharing = true;

+var trashBinApp = true;
\ No newline at end of file
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index f1241fce51e..6c810e4c2bd 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -22,6 +22,31 @@ $(document).ready(function() {
 			});
 		};
 		
+		FileActions.register('all', 'Delete', OC.PERMISSION_READ, function () {
+			return OC.imagePath('core', 'actions/delete');
+		}, function (filename) {
+			$('.tipsy').remove();
+			
+			var tr=$('tr').filterAttr('data-file', filename);
+			var deleteAction = $('tr').filterAttr('data-file',filename).children("td.date").children(".action.delete");
+			var oldHTML = deleteAction[0].outerHTML;
+			var newHTML = '<img class="move2trash" data-action="Delete" title="'+t('files', 'delete file permanently')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
+			deleteAction[0].outerHTML = newHTML;
+			
+			$.post(OC.filePath('files_trashbin','ajax','delete.php'),
+				{file:tr.attr('data-file') },
+				function(result){
+					if ( result.status == 'success' ) {
+						var row = document.getElementById(result.data.filename);
+						row.parentNode.removeChild(row);
+					} else {
+						deleteAction[0].outerHTML = oldHTML;
+						OC.dialogs.alert(result.data.message, 'Error');
+					}
+				});
+			
+			});
+		
 		// Sets the select_all checkbox behaviour :
 		$('#select_all').click(function() {
 			if($(this).attr('checked')){
diff --git a/apps/files_trashbin/l10n/ca.php b/apps/files_trashbin/l10n/ca.php
index 3af33c8a310..803b0c81ef0 100644
--- a/apps/files_trashbin/l10n/ca.php
+++ b/apps/files_trashbin/l10n/ca.php
@@ -1,5 +1,8 @@
 <?php $TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "No s'ha pogut esborrar permanentment %s",
+"Couldn't restore %s" => "No s'ha pogut restaurar %s",
 "perform restore operation" => "executa l'operació de restauració",
+"delete file permanently" => "esborra el fitxer permanentment",
 "Name" => "Nom",
 "Deleted" => "Eliminat",
 "1 folder" => "1 carpeta",
diff --git a/apps/files_trashbin/l10n/cs_CZ.php b/apps/files_trashbin/l10n/cs_CZ.php
index caaaea37436..eeb27784d3e 100644
--- a/apps/files_trashbin/l10n/cs_CZ.php
+++ b/apps/files_trashbin/l10n/cs_CZ.php
@@ -1,5 +1,8 @@
 <?php $TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "Nelze trvale odstranit %s",
+"Couldn't restore %s" => "Nelze obnovit %s",
 "perform restore operation" => "provést obnovu",
+"delete file permanently" => "trvale odstranit soubor",
 "Name" => "Název",
 "Deleted" => "Smazáno",
 "1 folder" => "1 složka",
diff --git a/apps/files_trashbin/l10n/de_DE.php b/apps/files_trashbin/l10n/de_DE.php
index 45e30d85a3b..e293bf0b2eb 100644
--- a/apps/files_trashbin/l10n/de_DE.php
+++ b/apps/files_trashbin/l10n/de_DE.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "perform restore operation" => "Führe die Wiederherstellung aus",
+"delete file permanently" => "Datei entgültig löschen",
 "Name" => "Name",
 "Deleted" => "Gelöscht",
 "1 folder" => "1 Ordner",
diff --git a/apps/files_trashbin/l10n/es.php b/apps/files_trashbin/l10n/es.php
index b191ffc4246..c14b9776473 100644
--- a/apps/files_trashbin/l10n/es.php
+++ b/apps/files_trashbin/l10n/es.php
@@ -1,5 +1,8 @@
 <?php $TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "No se puede eliminar %s permanentemente",
+"Couldn't restore %s" => "No se puede restaurar %s",
 "perform restore operation" => "Restaurar",
+"delete file permanently" => "Eliminar archivo permanentemente",
 "Name" => "Nombre",
 "Deleted" => "Eliminado",
 "1 folder" => "1 carpeta",
diff --git a/apps/files_trashbin/l10n/fr.php b/apps/files_trashbin/l10n/fr.php
index 51ade82d908..609b2fa9bd7 100644
--- a/apps/files_trashbin/l10n/fr.php
+++ b/apps/files_trashbin/l10n/fr.php
@@ -1,5 +1,8 @@
 <?php $TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "Impossible d'effacer %s de façon permanente",
+"Couldn't restore %s" => "Impossible de restaurer %s",
 "perform restore operation" => "effectuer l'opération de restauration",
+"delete file permanently" => "effacer définitivement le fichier",
 "Name" => "Nom",
 "Deleted" => "Effacé",
 "1 folder" => "1 dossier",
diff --git a/apps/files_trashbin/l10n/it.php b/apps/files_trashbin/l10n/it.php
index 7def431a42a..8627682d088 100644
--- a/apps/files_trashbin/l10n/it.php
+++ b/apps/files_trashbin/l10n/it.php
@@ -1,5 +1,8 @@
 <?php $TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "Impossibile eliminare %s definitivamente",
+"Couldn't restore %s" => "Impossibile ripristinare %s",
 "perform restore operation" => "esegui operazione di ripristino",
+"delete file permanently" => "elimina il file definitivamente",
 "Name" => "Nome",
 "Deleted" => "Eliminati",
 "1 folder" => "1 cartella",
diff --git a/apps/files_trashbin/l10n/ja_JP.php b/apps/files_trashbin/l10n/ja_JP.php
index 0b4e1954e74..2bccf3f3bd5 100644
--- a/apps/files_trashbin/l10n/ja_JP.php
+++ b/apps/files_trashbin/l10n/ja_JP.php
@@ -1,5 +1,8 @@
 <?php $TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "%s を完全に削除出来ませんでした",
+"Couldn't restore %s" => "%s を復元出来ませんでした",
 "perform restore operation" => "復元操作を実行する",
+"delete file permanently" => "ファイルを完全に削除する",
 "Name" => "名前",
 "Deleted" => "削除済み",
 "1 folder" => "1 フォルダ",
diff --git a/apps/files_trashbin/l10n/lv.php b/apps/files_trashbin/l10n/lv.php
index 017a8d285c0..5ecb99b9892 100644
--- a/apps/files_trashbin/l10n/lv.php
+++ b/apps/files_trashbin/l10n/lv.php
@@ -1,5 +1,8 @@
 <?php $TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "Nevarēja pilnībā izdzēst %s",
+"Couldn't restore %s" => "Nevarēja atjaunot %s",
 "perform restore operation" => "veikt atjaunošanu",
+"delete file permanently" => "dzēst datni pavisam",
 "Name" => "Nosaukums",
 "Deleted" => "Dzēsts",
 "1 folder" => "1 mape",
diff --git a/apps/files_trashbin/l10n/nl.php b/apps/files_trashbin/l10n/nl.php
index 4efa6ecf662..a41a5c2fd9c 100644
--- a/apps/files_trashbin/l10n/nl.php
+++ b/apps/files_trashbin/l10n/nl.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "perform restore operation" => "uitvoeren restore operatie",
+"delete file permanently" => "verwijder bestanden definitief",
 "Name" => "Naam",
 "Deleted" => "Verwijderd",
 "1 folder" => "1 map",
diff --git a/apps/files_trashbin/l10n/ru.php b/apps/files_trashbin/l10n/ru.php
index 23d739a2ff7..f6c85a6800e 100644
--- a/apps/files_trashbin/l10n/ru.php
+++ b/apps/files_trashbin/l10n/ru.php
@@ -1,7 +1,14 @@
 <?php $TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "%s не может быть удалён навсегда",
+"Couldn't restore %s" => "%s не может быть восстановлен",
+"perform restore operation" => "выполнить операцию восстановления",
+"delete file permanently" => "удалить файл навсегда",
 "Name" => "Имя",
+"Deleted" => "Удалён",
 "1 folder" => "1 папка",
 "{count} folders" => "{count} папок",
 "1 file" => "1 файл",
-"{count} files" => "{count} файлов"
+"{count} files" => "{count} файлов",
+"Nothing in here. Your trash bin is empty!" => "Здесь ничего нет. Ваша корзина пуста!",
+"Restore" => "Восстановить"
 );
diff --git a/apps/files_trashbin/l10n/ru_RU.php b/apps/files_trashbin/l10n/ru_RU.php
index 8ef2658cf24..c5b1408e2cc 100644
--- a/apps/files_trashbin/l10n/ru_RU.php
+++ b/apps/files_trashbin/l10n/ru_RU.php
@@ -3,5 +3,6 @@
 "1 folder" => "1 папка",
 "{count} folders" => "{количество} папок",
 "1 file" => "1 файл",
-"{count} files" => "{количество} файлов"
+"{count} files" => "{количество} файлов",
+"Restore" => "Восстановить"
 );
diff --git a/apps/files_trashbin/l10n/sk_SK.php b/apps/files_trashbin/l10n/sk_SK.php
index 81d43614d7b..759850783e2 100644
--- a/apps/files_trashbin/l10n/sk_SK.php
+++ b/apps/files_trashbin/l10n/sk_SK.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
+"Couldn't restore %s" => "Nemožno obnoviť %s",
 "perform restore operation" => "vykonať obnovu",
+"delete file permanently" => "trvalo zmazať súbor",
 "Name" => "Meno",
 "Deleted" => "Zmazané",
 "1 folder" => "1 priečinok",
diff --git a/apps/files_trashbin/l10n/sv.php b/apps/files_trashbin/l10n/sv.php
index ca4dba04967..5bde85e7056 100644
--- a/apps/files_trashbin/l10n/sv.php
+++ b/apps/files_trashbin/l10n/sv.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"perform restore operation" => "utför återställning",
 "Name" => "Namn",
 "Deleted" => "Raderad",
 "1 folder" => "1 mapp",
diff --git a/apps/files_trashbin/lib/hooks.php b/apps/files_trashbin/lib/hooks.php
index d3bee105b51..d6a62d447b8 100644
--- a/apps/files_trashbin/lib/hooks.php
+++ b/apps/files_trashbin/lib/hooks.php
@@ -24,7 +24,7 @@
  * This class contains all hooks.
  */
 
-namespace OCA_Trash;
+namespace OCA\Files_Trashbin;
 
 class Hooks {
 
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index a7eff3d44e0..bc6562b2080 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -20,7 +20,7 @@
  *

  */

 
-namespace OCA_Trash;

+namespace OCA\Files_Trashbin;

 

 class Trashbin {
 	
@@ -65,7 +65,7 @@ class Trashbin {
 			if ( \OCP\App::isEnabled('files_versions') ) {

 				if ( $view->is_dir('files_versions'.$file_path) ) {

 					$view->rename('files_versions'.$file_path, 'versions_trashbin/'. $deleted.'.d'.$timestamp);

-				} else if ( $versions = \OCA_Versions\Storage::getVersions($file_path) ) {

+				} else if ( $versions = \OCA\Files_Versions\Storage::getVersions($file_path) ) {

 					foreach ($versions as $v) {

 						$view->rename('files_versions'.$v['path'].'.v'.$v['version'], 'versions_trashbin/'. $deleted.'.v'.$v['version'].'.d'.$timestamp);

 					}

@@ -151,6 +151,45 @@ class Trashbin {
 	}
 	
 	/**

+	 * delete file from trash bin permanently

+	 * @param $filename path to the file
+	 * @param $timestamp of deletion time

+	 * @return true/false

+	 */

+	public static function delete($filename, $timestamp=null) {

+	

+		$user = \OCP\User::getUser();

+		$view = new \OC_FilesystemView('/'.$user);

+	

+		if ( $timestamp ) {

+			$query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE user=? AND id=? AND timestamp=?');

+			$query->execute(array($user,$filename,$timestamp));

+			$file = $filename.'.d'.$timestamp;
+		} else {
+			$file = $filename;
+		}
+		
+		if ( \OCP\App::isEnabled('files_versions') ) {
+			if ($view->is_dir('versions_trashbin/'.$file)) {
+				$view->unlink('versions_trashbin/'.$file);
+			} else if ( $versions = self::getVersionsFromTrash($file, $timestamp) ) {
+				foreach ($versions as $v) {
+					if ($timestamp ) {
+						$view->unlink('versions_trashbin/'.$filename.'.v'.$v.'.d'.$timestamp);
+					} else {
+						$view->unlink('versions_trashbin/'.$file.'.v'.$v);
+					}
+				}
+			}
+		}

+	
+		$view->unlink('/files_trashbin/'.$file);
+		

+		return true;

+	}
+	
+	
+	/**

 	 * clean up the trash bin

 	 */

 	private static function expire() {
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index c3e51b4becd..24e4a0e6c69 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -9,7 +9,7 @@
 	<div id="emptyfolder"><?php echo $l->t('Nothing in here. Your trash bin is empty!')?></div>
 <?php endif; ?>
 
-<table>
+<table class="hascontrols">
 	<thead>
 		<tr>
 			<th id='headerName'>
diff --git a/apps/files_versions/ajax/rollbackVersion.php b/apps/files_versions/ajax/rollbackVersion.php
index dc5a59cb4af..2970915ac63 100644
--- a/apps/files_versions/ajax/rollbackVersion.php
+++ b/apps/files_versions/ajax/rollbackVersion.php
@@ -11,6 +11,7 @@ $revision=(int)$_GET['revision'];
 if(OCA\Files_Versions\Storage::rollback( $file, $revision )) {
 	OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file )));
 }else{
-	OCP\JSON::error(array("data" => array( "message" => "Could not revert:" . $file )));
+	$l = OC_L10N::get('files_versions');
+	OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) ))));
 }
 
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index 1bd5cde44be..437a3fec065 100644
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -24,6 +24,7 @@
 OCP\User::checkLoggedIn( );
 OCP\Util::addStyle('files_versions', 'versions');
 $tmpl = new OCP\Template( 'files_versions', 'history', 'user' );
+$l = OC_L10N::get('files_versions');
 
 if ( isset( $_GET['path'] ) ) {
 
@@ -36,15 +37,21 @@ if ( isset( $_GET['path'] ) ) {
 
 		if( $versions->rollback( $path, $_GET['revert'] ) ) {
 
-			$tmpl->assign( 'outcome_stat', 'success' );
+			$tmpl->assign( 'outcome_stat', $l->t('success') );
 
-			$tmpl->assign( 'outcome_msg', "File {$_GET['path']} was reverted to version ".OCP\Util::formatDate( doubleval($_GET['revert']) ) );
+			$message = $l->t('File %s was reverted to version %s',
+				array($_GET['path'], OCP\Util::formatDate( doubleval($_GET['revert']) ) ) );
+
+			$tmpl->assign( 'outcome_msg', $message);
 
 		} else {
 
-			$tmpl->assign( 'outcome_stat', 'failure' );
+			$tmpl->assign( 'outcome_stat', $l->t('failure') );
+
+			$message = $l->t('File %s could not be reverted to version %s',
+				array($_GET['path'], OCP\Util::formatDate( doubleval($_GET['revert']) ) ) );
 
-			$tmpl->assign( 'outcome_msg', "File {$_GET['path']} could not be reverted to version ".OCP\Util::formatDate( doubleval($_GET['revert']) ) );
+			$tmpl->assign( 'outcome_msg', $message);
 
 		}
 
@@ -58,12 +65,12 @@ if ( isset( $_GET['path'] ) ) {
 
 	}else{
 
-		$tmpl->assign( 'message', 'No old versions available' );
+		$tmpl->assign( 'message', $l->t('No old versions available') );
 
 	}
 }else{
 
-	$tmpl->assign( 'message', 'No path specified' );
+	$tmpl->assign( 'message', $l->t('No path specified') );
 
 }
 
diff --git a/apps/files_versions/l10n/ca.php b/apps/files_versions/l10n/ca.php
index 01e0a116873..fc900c47dc7 100644
--- a/apps/files_versions/l10n/ca.php
+++ b/apps/files_versions/l10n/ca.php
@@ -1,5 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Could not revert: %s" => "No s'ha pogut revertir: %s",
+"success" => "èxit",
+"File %s was reverted to version %s" => "El fitxer %s s'ha revertit a la versió %s",
+"failure" => "fallada",
+"File %s could not be reverted to version %s" => "El fitxer %s no s'ha pogut revertir a la versió %s",
+"No old versions available" => "No hi ha versións antigues disponibles",
+"No path specified" => "No heu especificat el camí",
 "History" => "Historial",
+"Revert a file to a previous version by clicking on its revert button" => "Reverteix un fitxer a una versió anterior fent clic en el seu botó de reverteix",
 "Files Versioning" => "Fitxers de Versions",
 "Enable" => "Habilita"
 );
diff --git a/apps/files_versions/l10n/cs_CZ.php b/apps/files_versions/l10n/cs_CZ.php
index d219c3e68da..22d4a2ad827 100644
--- a/apps/files_versions/l10n/cs_CZ.php
+++ b/apps/files_versions/l10n/cs_CZ.php
@@ -1,5 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Could not revert: %s" => "Nelze navrátit: %s",
+"success" => "úspěch",
+"File %s was reverted to version %s" => "Soubor %s byl navrácen na verzi %s",
+"failure" => "sehlhání",
+"File %s could not be reverted to version %s" => "Soubor %s nemohl být navrácen na verzi %s",
+"No old versions available" => "Nejsou dostupné žádné starší verze",
+"No path specified" => "Nezadána cesta",
 "History" => "Historie",
+"Revert a file to a previous version by clicking on its revert button" => "Navraťte soubor do předchozí verze kliknutím na tlačítko navrátit",
 "Files Versioning" => "Verzování souborů",
 "Enable" => "Povolit"
 );
diff --git a/apps/files_versions/l10n/de_DE.php b/apps/files_versions/l10n/de_DE.php
index 2fcb996de7b..cf33bb071e6 100644
--- a/apps/files_versions/l10n/de_DE.php
+++ b/apps/files_versions/l10n/de_DE.php
@@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"success" => "Erfolgreich",
+"failure" => "Fehlgeschlagen",
+"No old versions available" => "keine älteren Versionen verfügbar",
+"No path specified" => "Kein Pfad angegeben",
 "History" => "Historie",
 "Files Versioning" => "Dateiversionierung",
 "Enable" => "Aktivieren"
diff --git a/apps/files_versions/l10n/es.php b/apps/files_versions/l10n/es.php
index 4a8c34e5180..608e171a4b1 100644
--- a/apps/files_versions/l10n/es.php
+++ b/apps/files_versions/l10n/es.php
@@ -1,5 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Could not revert: %s" => "No se puede revertir: %s",
+"success" => "exitoso",
+"File %s was reverted to version %s" => "El archivo %s fue revertido a la version %s",
+"failure" => "fallo",
+"File %s could not be reverted to version %s" => "El archivo %s no puede ser revertido a la version %s",
+"No old versions available" => "No hay versiones antiguas disponibles",
+"No path specified" => "Ruta no especificada",
 "History" => "Historial",
+"Revert a file to a previous version by clicking on its revert button" => "Revertir un archivo a una versión anterior haciendo clic en el boton de revertir",
 "Files Versioning" => "Versionado de archivos",
 "Enable" => "Habilitar"
 );
diff --git a/apps/files_versions/l10n/fr.php b/apps/files_versions/l10n/fr.php
index 2d26b98860a..6b2cf9ba6b5 100644
--- a/apps/files_versions/l10n/fr.php
+++ b/apps/files_versions/l10n/fr.php
@@ -1,5 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Could not revert: %s" => "Impossible de restaurer %s",
+"success" => "succès",
+"File %s was reverted to version %s" => "Le fichier %s a été restauré dans sa version %s",
+"failure" => "échec",
+"File %s could not be reverted to version %s" => "Le fichier %s ne peut être restauré dans sa version %s",
+"No old versions available" => "Aucune ancienne version n'est disponible",
+"No path specified" => "Aucun chemin spécifié",
 "History" => "Historique",
+"Revert a file to a previous version by clicking on its revert button" => "Restaurez un fichier dans une version antérieure en cliquant sur son bouton de restauration",
 "Files Versioning" => "Versionnage des fichiers",
 "Enable" => "Activer"
 );
diff --git a/apps/files_versions/l10n/it.php b/apps/files_versions/l10n/it.php
index c57b0930111..3289f7f68d1 100644
--- a/apps/files_versions/l10n/it.php
+++ b/apps/files_versions/l10n/it.php
@@ -1,5 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Could not revert: %s" => "Impossibild ripristinare: %s",
+"success" => "completata",
+"File %s was reverted to version %s" => "Il file %s è stato ripristinato alla versione %s",
+"failure" => "non riuscita",
+"File %s could not be reverted to version %s" => "Il file %s non può essere ripristinato alla versione %s",
+"No old versions available" => "Non sono disponibili versioni precedenti",
+"No path specified" => "Nessun percorso specificato",
 "History" => "Cronologia",
+"Revert a file to a previous version by clicking on its revert button" => "Ripristina un file a una versione precedente facendo clic sul rispettivo pulsante di ripristino",
 "Files Versioning" => "Controllo di versione dei file",
 "Enable" => "Abilita"
 );
diff --git a/apps/files_versions/l10n/ja_JP.php b/apps/files_versions/l10n/ja_JP.php
index c97ba3d00ee..16018765708 100644
--- a/apps/files_versions/l10n/ja_JP.php
+++ b/apps/files_versions/l10n/ja_JP.php
@@ -1,5 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Could not revert: %s" => "元に戻せませんでした: %s",
+"success" => "成功",
+"File %s was reverted to version %s" => "ファイル %s をバージョン %s に戻しました",
+"failure" => "失敗",
+"File %s could not be reverted to version %s" => "ファイル %s をバージョン %s に戻せませんでした",
+"No old versions available" => "利用可能な古いバージョンはありません",
+"No path specified" => "パスが指定されていません",
 "History" => "履歴",
+"Revert a file to a previous version by clicking on its revert button" => "もとに戻すボタンをクリックすると、ファイルを過去のバージョンに戻します",
 "Files Versioning" => "ファイルのバージョン管理",
 "Enable" => "有効化"
 );
diff --git a/apps/files_versions/l10n/lv.php b/apps/files_versions/l10n/lv.php
index ae2ead12f4c..2203dc706b8 100644
--- a/apps/files_versions/l10n/lv.php
+++ b/apps/files_versions/l10n/lv.php
@@ -1,5 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Could not revert: %s" => "Nevarēja atgriezt — %s",
+"success" => "veiksme",
+"File %s was reverted to version %s" => "Datne %s tika atgriezt uz versiju %s",
+"failure" => "neveiksme",
+"File %s could not be reverted to version %s" => "Datni %s nevarēja atgriezt uz versiju %s",
+"No old versions available" => "Nav pieejamu vecāku versiju",
+"No path specified" => "Nav norādīts ceļš",
 "History" => "Vēsture",
+"Revert a file to a previous version by clicking on its revert button" => "Atgriez datni uz iepriekšēju versiju, spiežot uz tās atgriešanas pogu",
 "Files Versioning" => "Datņu versiju izskošana",
 "Enable" => "Aktivēt"
 );
diff --git a/apps/files_versions/l10n/ru.php b/apps/files_versions/l10n/ru.php
index 4c7fb501091..221d24ce8d1 100644
--- a/apps/files_versions/l10n/ru.php
+++ b/apps/files_versions/l10n/ru.php
@@ -1,5 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Could not revert: %s" => "Не может быть возвращён: %s",
+"success" => "успех",
+"File %s was reverted to version %s" => "Файл %s был возвращён к версии %s",
+"failure" => "провал",
+"File %s could not be reverted to version %s" => "Файл %s не может быть возвращён к версии %s",
+"No old versions available" => "Нет доступных старых версий",
+"No path specified" => "Путь не указан",
 "History" => "История",
+"Revert a file to a previous version by clicking on its revert button" => "Вернуть файл к предыдущей версии нажатием на кнопку возврата",
 "Files Versioning" => "Версии файлов",
 "Enable" => "Включить"
 );
diff --git a/apps/files_versions/l10n/sk_SK.php b/apps/files_versions/l10n/sk_SK.php
index a3a3567cb4f..8a59286b5a5 100644
--- a/apps/files_versions/l10n/sk_SK.php
+++ b/apps/files_versions/l10n/sk_SK.php
@@ -1,4 +1,9 @@
 <?php $TRANSLATIONS = array(
+"success" => "uspech",
+"File %s was reverted to version %s" => "Subror %s bol vrateny na verziu %s",
+"failure" => "chyba",
+"No old versions available" => "Nie sú dostupné žiadne staršie verzie",
+"No path specified" => "Nevybrali ste cestu",
 "History" => "História",
 "Files Versioning" => "Vytváranie verzií súborov",
 "Enable" => "Zapnúť"
diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
index cc5a494f19e..850ece89c98 100644
--- a/apps/files_versions/templates/history.php
+++ b/apps/files_versions/templates/history.php
@@ -17,7 +17,7 @@ if( isset( $_['message'] ) ) {
 	}
 
 	echo( '<strong>Versions of '.$_['path'] ).'</strong><br>';
-	echo('<p><em>Revert a file to a previous version by clicking on its revert button</em></p><br />');
+	echo('<p><em>'.$l->t('Revert a file to a previous version by clicking on its revert button').'</em></p><br />');
 
 	foreach ( $_['versions'] as $v ) {
 		echo ' ';
diff --git a/apps/user_ldap/l10n/bn_BD.php b/apps/user_ldap/l10n/bn_BD.php
index 6c347eab879..69dfc896179 100644
--- a/apps/user_ldap/l10n/bn_BD.php
+++ b/apps/user_ldap/l10n/bn_BD.php
@@ -18,7 +18,6 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "কোন স্থান ধারক ব্যতীত, উদাহরণঃ\"objectClass=posixGroup\"।",
 "Port" => "পোর্ট",
 "Use TLS" => "TLS ব্যবহার কর",
-"Do not use it for SSL connections, it will fail." => "SSL সংযোগের জন্য এটি ব্যবহার করবেন না, তাহলে ব্যর্থ হবেনই।",
 "Case insensitve LDAP server (Windows)" => "বর্ণ অসংবেদী LDAP  সার্ভার (উইন্ডোজ)",
 "Turn off SSL certificate validation." => "SSL সনদপত্র যাচাইকরণ বন্ধ রাক।",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "শুধুমাত্র যদি এই বিকল্পটি ব্যবহার করেই সংযোগ কার্যকরী হয় তবে আপনার ownCloud সার্ভারে LDAP সার্ভারের SSL সনদপত্রটি আমদানি করুন।",
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index 5cf03b6787b..e4f27e25a7f 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -43,7 +43,7 @@
 "Disable Main Server" => "Desactiva el servidor principal",
 "When switched on, ownCloud will only connect to the replica server." => "Quan està connectat, ownCloud només es connecta al servidor de la rèplica.",
 "Use TLS" => "Usa TLS",
-"Do not use it for SSL connections, it will fail." => "No ho useu en connexions SSL, fallarà.",
+"Do not use it additionally for LDAPS connections, it will fail." => "No ho useu adicionalment per a conexions LDAPS, fallarà.",
 "Case insensitve LDAP server (Windows)" => "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)",
 "Turn off SSL certificate validation." => "Desactiva la validació de certificat SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la connexió només funciona amb aquesta opció, importeu el certificat SSL del servidor LDAP en el vostre servidor ownCloud.",
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index 0aace1f7410..4c74f195cf4 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -43,7 +43,7 @@
 "Disable Main Server" => "Zakázat hlavní serveru",
 "When switched on, ownCloud will only connect to the replica server." => "Při zapnutí se ownCloud připojí pouze k záložnímu serveru",
 "Use TLS" => "Použít TLS",
-"Do not use it for SSL connections, it will fail." => "Nepoužívejte pro připojení pomocí SSL, připojení selže.",
+"Do not use it additionally for LDAPS connections, it will fail." => "Nepoužívejte pro spojení LDAP, selže.",
 "Case insensitve LDAP server (Windows)" => "LDAP server nerozlišující velikost znaků (Windows)",
 "Turn off SSL certificate validation." => "Vypnout ověřování SSL certifikátu.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Pokud připojení pracuje pouze s touto možností, tak importujte SSL certifikát SSL serveru do Vašeho serveru ownCloud",
diff --git a/apps/user_ldap/l10n/da.php b/apps/user_ldap/l10n/da.php
index dd7fb8a1a0c..9329c4e8a24 100644
--- a/apps/user_ldap/l10n/da.php
+++ b/apps/user_ldap/l10n/da.php
@@ -14,7 +14,6 @@
 "Defines the filter to apply, when retrieving groups." => "Definere filteret der bruges når der indlæses grupper.",
 "Port" => "Port",
 "Use TLS" => "Brug TLS",
-"Do not use it for SSL connections, it will fail." => "Brug ikke til SSL forbindelser, da den vil fejle.",
 "Turn off SSL certificate validation." => "Deaktiver SSL certifikat validering",
 "Not recommended, use for testing only." => "Anbefales ikke, brug kun for at teste.",
 "User Display Name Field" => "User Display Name Field",
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index df680465c98..618e7a32457 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -23,7 +23,6 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "ohne Platzhalter, z.B.: \"objectClass=posixGroup\"",
 "Port" => "Port",
 "Use TLS" => "Nutze TLS",
-"Do not use it for SSL connections, it will fail." => "Verwende dies nicht für SSL-Verbindungen, es wird fehlschlagen.",
 "Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)",
 "Turn off SSL certificate validation." => "Schalte die SSL-Zertifikatsprüfung aus.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden.",
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index 1b47cfec2a6..7d3847f8a89 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -43,7 +43,6 @@
 "Disable Main Server" => "Hauptserver deaktivieren",
 "When switched on, ownCloud will only connect to the replica server." => "Wenn eingeschaltet wird sich ownCloud nur mit dem Replilat-Server verbinden.",
 "Use TLS" => "Nutze TLS",
-"Do not use it for SSL connections, it will fail." => "Verwenden Sie dies nicht für SSL-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.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden.",
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index 3951c94dfa7..7c0940dc09c 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -20,7 +20,6 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=ΟμάδαPosix\".",
 "Port" => "Θύρα",
 "Use TLS" => "Χρήση TLS",
-"Do not use it for SSL connections, it will fail." => "Μην χρησιμοποιείτε για συνδέσεις SSL, θα αποτύχει.",
 "Case insensitve LDAP server (Windows)" => "LDAP server (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." => "Εάν η σύνδεση δουλεύει μόνο με αυτή την επιλογή, εισάγετε το LDAP SSL πιστοποιητικό του διακομιστή στον ownCloud server σας.",
diff --git a/apps/user_ldap/l10n/eo.php b/apps/user_ldap/l10n/eo.php
index 2a2b70603c5..3ffcbddb3e3 100644
--- a/apps/user_ldap/l10n/eo.php
+++ b/apps/user_ldap/l10n/eo.php
@@ -17,7 +17,6 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "sen ajna referencilo, ekz.: \"objectClass=posixGroup\".",
 "Port" => "Pordo",
 "Use TLS" => "Uzi TLS-on",
-"Do not use it for SSL connections, it will fail." => "Ne uzu ĝin por SSL-konektoj, ĝi malsukcesos.",
 "Case insensitve LDAP server (Windows)" => "LDAP-servilo blinda je litergrandeco (Vindozo)",
 "Turn off SSL certificate validation." => "Malkapabligi validkontrolon de SSL-atestiloj.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se la konekto nur funkcias kun ĉi tiu malnepro, enportu la SSL-atestilo de la LDAP-servilo en via ownCloud-servilo.",
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index 3740d13e224..c0a444c0c7d 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -43,7 +43,7 @@
 "Disable Main Server" => "Deshabilitar servidor principal",
 "When switched on, ownCloud will only connect to the replica server." => "Cuando se inicie, ownCloud unicamente estara conectado al servidor replica",
 "Use TLS" => "Usar TLS",
-"Do not use it for SSL connections, it will fail." => "No usarlo para SSL, habrá error.",
+"Do not use it additionally for LDAPS connections, it will fail." => "No usar adicionalmente para conecciones LDAPS, estas fallaran",
 "Case insensitve LDAP server (Windows)" => "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)",
 "Turn off SSL certificate validation." => "Apagar la validación por certificado SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la conexión sólo funciona con esta opción, importe el certificado SSL del servidor LDAP en su servidor ownCloud.",
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
index dce2321e6b1..a87444a270c 100644
--- a/apps/user_ldap/l10n/es_AR.php
+++ b/apps/user_ldap/l10n/es_AR.php
@@ -1,7 +1,17 @@
 <?php $TRANSLATIONS = array(
+"Failed to delete the server configuration" => "Fallo al borrar la configuración del servidor",
+"The configuration is valid and the connection could be established!" => "La configuración es valida y la conexión pudo ser establecida.",
 "Deletion failed" => "Error al borrar",
+"Keep settings?" => "¿Mantener preferencias?",
+"Cannot add server configuration" => "No se pudo añadir la configuración del servidor",
+"Connection test succeeded" => "El este de conexión ha sido completado satisfactoriamente",
+"Connection test failed" => "Falló es test de conexión",
+"Do you really want to delete the current Server Configuration?" => "¿Realmente desea borrar la configuración actual del servidor?",
+"Confirm Deletion" => "Confirmar borrado",
 "<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>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.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<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.",
+"Server configuration" => "Configuración del Servidor",
+"Add Server Configuration" => "Añadir Configuración del Servidor",
 "Host" => "Servidor",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Podés omitir el protocolo, excepto si SSL es requerido. En ese caso, empezá con ldaps://",
 "Base DN" => "DN base",
@@ -20,14 +30,17 @@
 "Group Filter" => "Filtro de grupo",
 "Defines the filter to apply, when retrieving groups." => "Define el filtro a aplicar cuando se obtienen grupos.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "Sin ninguna plantilla, p. ej.: \"objectClass=posixGroup\".",
+"Connection Settings" => "Configuración de Conección",
+"Configuration Active" => "Configuración activa",
 "Port" => "Puerto",
+"Disable Main Server" => "Deshabilitar el Servidor Principal",
 "Use TLS" => "Usar TLS",
-"Do not use it for SSL connections, it will fail." => "No usarlo para SSL, dará error.",
 "Case insensitve LDAP server (Windows)" => "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)",
 "Turn off SSL certificate validation." => "Desactivar la validación por certificado SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la conexión sólo funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor ownCloud.",
 "Not recommended, use for testing only." => "No recomendado, sólo para pruebas.",
 "in seconds. A change empties the cache." => "en segundos. Cambiarlo vacía la cache.",
+"Directory Settings" => "Configuración de Directorio",
 "User Display Name Field" => "Campo de nombre de usuario a mostrar",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "El atributo LDAP a usar para generar el nombre de usuario de ownCloud.",
 "Base User Tree" => "Árbol base de usuario",
@@ -37,6 +50,7 @@
 "Base Group Tree" => "Árbol base de grupo",
 "One Group Base DN per line" => "Una DN base de grupo por línea",
 "Group-Member association" => "Asociación Grupo-Miembro",
+"Special Attributes" => "Atributos Especiales",
 "in bytes" => "en bytes",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD.",
 "Help" => "Ayuda"
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
index ba03a8a8093..91eb38c7c5f 100644
--- a/apps/user_ldap/l10n/et_EE.php
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -19,7 +19,6 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "ilma ühegi kohatäitjata, nt. \"objectClass=posixGroup\".",
 "Port" => "Port",
 "Use TLS" => "Kasutaja TLS",
-"Do not use it for SSL connections, it will fail." => "Ära kasuta seda SSL ühenduse jaoks, see ei toimi.",
 "Case insensitve LDAP server (Windows)" => "Mittetõstutundlik LDAP server (Windows)",
 "Turn off SSL certificate validation." => "Lülita SSL sertifikaadi kontrollimine välja.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Kui ühendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma ownCloud serverisse.",
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
index 2aad2363ce9..97c23f86480 100644
--- a/apps/user_ldap/l10n/eu.php
+++ b/apps/user_ldap/l10n/eu.php
@@ -22,7 +22,6 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "txantiloirik gabe, adb. \"objectClass=posixGroup\".",
 "Port" => "Portua",
 "Use TLS" => "Erabili TLS",
-"Do not use it for SSL connections, it will fail." => "Ez erabili SSL konexioetan, huts egingo du.",
 "Case insensitve LDAP server (Windows)" => "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)",
 "Turn off SSL certificate validation." => "Ezgaitu SSL ziurtagirien egiaztapena.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Konexioa aukera hau ezinbestekoa badu, inportatu LDAP zerbitzariaren SSL ziurtagiria zure ownCloud zerbitzarian.",
diff --git a/apps/user_ldap/l10n/fi_FI.php b/apps/user_ldap/l10n/fi_FI.php
index 4f8fd3f2d17..1c2a92f844a 100644
--- a/apps/user_ldap/l10n/fi_FI.php
+++ b/apps/user_ldap/l10n/fi_FI.php
@@ -19,7 +19,6 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "ilman paikanvaraustermiä, ts. \"objectClass=posixGroup\".",
 "Port" => "Portti",
 "Use TLS" => "Käytä TLS:ää",
-"Do not use it for SSL connections, it will fail." => "Älä käytä SSL-yhteyttä varten, se epäonnistuu. ",
 "Case insensitve LDAP server (Windows)" => "Kirjainkoosta piittamaton LDAP-palvelin (Windows)",
 "Turn off SSL certificate validation." => "Poista käytöstä SSL-varmenteen vahvistus",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Jos yhteys toimii vain tällä valinnalla, siirrä LDAP-palvelimen SSL-varmenne ownCloud-palvelimellesi.",
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index 9bb350ea23c..abe13635698 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -43,7 +43,7 @@
 "Disable Main Server" => "Désactiver le serveur principal",
 "When switched on, ownCloud will only connect to the replica server." => "Lorsqu'activé, ownCloud ne se connectera qu'au serveur répliqué.",
 "Use TLS" => "Utiliser TLS",
-"Do not use it for SSL connections, it will fail." => "Ne pas utiliser pour les connexions SSL, car cela échouera.",
+"Do not use it additionally for LDAPS connections, it will fail." => "À ne pas utiliser pour les connexions LDAPS (cela échouera).",
 "Case insensitve LDAP server (Windows)" => "Serveur LDAP insensible à la casse (Windows)",
 "Turn off SSL certificate validation." => "Désactiver la validation du certificat SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur ownCloud.",
diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php
index a2531a40a83..36c1f7af114 100644
--- a/apps/user_ldap/l10n/gl.php
+++ b/apps/user_ldap/l10n/gl.php
@@ -20,7 +20,6 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "sen ningunha marca de posición, como p.ex «objectClass=grupoPosix».",
 "Port" => "Porto",
 "Use TLS" => "Usar TLS",
-"Do not use it for SSL connections, it will fail." => "Non empregalo para conexións SSL: fallará.",
 "Case insensitve LDAP server (Windows)" => "Servidor LDAP que non distingue entre maiúsculas e minúsculas (Windows)",
 "Turn off SSL certificate validation." => "Desactiva a validación do certificado SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se a conexión só funciona con esta opción importa o certificado SSL do servidor LDAP no seu servidor ownCloud.",
diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php
index 64de16fa65f..48a0823a583 100644
--- a/apps/user_ldap/l10n/hu_HU.php
+++ b/apps/user_ldap/l10n/hu_HU.php
@@ -22,7 +22,6 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "itt ne használjunk változót, pl. \"objectClass=posixGroup\".",
 "Port" => "Port",
 "Use TLS" => "Használjunk TLS-t",
-"Do not use it for SSL connections, it will fail." => "Ne használjuk SSL-kapcsolat esetén, mert nem fog működni!",
 "Case insensitve LDAP server (Windows)" => "Az LDAP-kiszolgáló nem tesz különbséget a kis- és nagybetűk között (Windows)",
 "Turn off SSL certificate validation." => "Ne ellenőrizzük az SSL-tanúsítvány érvényességét",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "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!",
diff --git a/apps/user_ldap/l10n/id.php b/apps/user_ldap/l10n/id.php
index 33e8cc70e93..c07892386d6 100644
--- a/apps/user_ldap/l10n/id.php
+++ b/apps/user_ldap/l10n/id.php
@@ -6,7 +6,6 @@
 "Group Filter" => "saringan grup",
 "Port" => "port",
 "Use TLS" => "gunakan TLS",
-"Do not use it for SSL connections, it will fail." => "jangan gunakan untuk koneksi SSL, itu akan gagal.",
 "Turn off SSL certificate validation." => "matikan validasi sertivikat SSL",
 "Not recommended, use for testing only." => "tidak disarankan, gunakan hanya untuk pengujian.",
 "in seconds. A change empties the cache." => "dalam detik. perubahan mengosongkan cache",
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index 0220aa958ce..594529190d9 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -43,7 +43,7 @@
 "Disable Main Server" => "Disabilita server principale",
 "When switched on, ownCloud will only connect to the replica server." => "Se abilitata, ownCloud si collegherà solo al server di replica.",
 "Use TLS" => "Usa TLS",
-"Do not use it for SSL connections, it will fail." => "Non utilizzare per le connessioni SSL, fallirà.",
+"Do not use it additionally for LDAPS connections, it will fail." => "Da non utilizzare per le connessioni LDAPS, non funzionerà.",
 "Case insensitve LDAP server (Windows)" => "Case insensitve LDAP server (Windows)",
 "Turn off SSL certificate validation." => "Disattiva il controllo del certificato SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server ownCloud.",
diff --git a/apps/user_ldap/l10n/ja_JP.php b/apps/user_ldap/l10n/ja_JP.php
index 7706357cbf3..11ad6cc7a37 100644
--- a/apps/user_ldap/l10n/ja_JP.php
+++ b/apps/user_ldap/l10n/ja_JP.php
@@ -43,7 +43,7 @@
 "Disable Main Server" => "メインサーバを無効にする",
 "When switched on, ownCloud will only connect to the replica server." => "有効にすると、ownCloudはレプリカサーバにのみ接続します。",
 "Use TLS" => "TLSを利用",
-"Do not use it for SSL connections, it will fail." => "SSL接続に利用しないでください、失敗します。",
+"Do not use it additionally for LDAPS connections, it will fail." => "LDAPS接続のために追加でそれを利用しないで下さい。失敗します。",
 "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." => "接続がこのオプションでのみ動作する場合は、LDAPサーバのSSL証明書をownCloudサーバにインポートしてください。",
diff --git a/apps/user_ldap/l10n/ko.php b/apps/user_ldap/l10n/ko.php
index 9ff8ff99d08..419e2d0a690 100644
--- a/apps/user_ldap/l10n/ko.php
+++ b/apps/user_ldap/l10n/ko.php
@@ -22,7 +22,6 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=posixGroup\"",
 "Port" => "포트",
 "Use TLS" => "TLS 사용",
-"Do not use it for SSL connections, it will fail." => "SSL 연결 시 사용하는 경우 연결되지 않습니다.",
 "Case insensitve LDAP server (Windows)" => "서버에서 대소문자를 구분하지 않음 (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." => "이 옵션을 사용해야 연결할 수 있는 경우에는 LDAP 서버의 SSL 인증서를 ownCloud로 가져올 수 있습니다.",
diff --git a/apps/user_ldap/l10n/lv.php b/apps/user_ldap/l10n/lv.php
index 48cee737c74..34e9196b8d9 100644
--- a/apps/user_ldap/l10n/lv.php
+++ b/apps/user_ldap/l10n/lv.php
@@ -43,7 +43,7 @@
 "Disable Main Server" => "Deaktivēt galveno serveri",
 "When switched on, ownCloud will only connect to the replica server." => "Kad ieslēgts, ownCloud savienosies tikai ar kopijas serveri.",
 "Use TLS" => "Lietot TLS",
-"Do not use it for SSL connections, it will fail." => "Neizmanto to SSL savienojumiem, tas neizdosies.",
+"Do not use it additionally for LDAPS connections, it will fail." => "Neizmanto papildu LDAPS savienojumus! Tas nestrādās.",
 "Case insensitve LDAP server (Windows)" => "Reģistrnejutīgs LDAP serveris (Windows)",
 "Turn off SSL certificate validation." => "Izslēgt SSL sertifikātu validēšanu.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Ja savienojums darbojas ar šo opciju, importē LDAP serveru SSL sertifikātu savā ownCloud serverī.",
diff --git a/apps/user_ldap/l10n/nb_NO.php b/apps/user_ldap/l10n/nb_NO.php
index 295166b0a50..8aab71354b0 100644
--- a/apps/user_ldap/l10n/nb_NO.php
+++ b/apps/user_ldap/l10n/nb_NO.php
@@ -4,7 +4,6 @@
 "Group Filter" => "Gruppefilter",
 "Port" => "Port",
 "Use TLS" => "Bruk TLS",
-"Do not use it for SSL connections, it will fail." => "Ikke bruk for SSL tilkoblinger, dette vil ikke fungere.",
 "Not recommended, use for testing only." => "Ikke anbefalt, bruk kun for testing",
 "in seconds. A change empties the cache." => "i sekunder. En endring tømmer bufferen.",
 "in bytes" => "i bytes",
diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php
index cc5e85fc30b..6879a4c4b94 100644
--- a/apps/user_ldap/l10n/nl.php
+++ b/apps/user_ldap/l10n/nl.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "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.",
 "The configuration is invalid. Please look in the ownCloud log for further details." => "De configuratie is ongeldig. Controleer de ownCloud log voor meer details.",
 "Deletion failed" => "Verwijderen mislukt",
 "Take over settings from recent server configuration?" => "Overnemen instellingen van de recente serverconfiguratie?",
@@ -32,29 +33,35 @@
 "Group Filter" => "Groep Filter",
 "Defines the filter to apply, when retrieving groups." => "Definiëerd de toe te passen filter voor het ophalen van groepen.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "zonder een placeholder, bijv. \"objectClass=posixGroup\"",
+"Connection Settings" => "Verbindingsinstellingen",
 "Configuration Active" => "Configuratie actief",
+"When unchecked, this configuration will be skipped." => "Als dit niet is ingeschakeld wordt deze configuratie overgeslagen.",
 "Port" => "Poort",
 "Backup (Replica) Host" => "Backup (Replica) Host",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Opgeven optionele backup host. Het moet een replica van de hoofd LDAP/AD server.",
 "Backup (Replica) Port" => "Backup (Replica) Poort",
 "Disable Main Server" => "Deactiveren hoofdserver",
 "When switched on, ownCloud will only connect to the replica server." => "Wanneer ingeschakeld, zal ownCloud allen verbinden met de replicaserver.",
 "Use TLS" => "Gebruik TLS",
-"Do not use it for SSL connections, it will fail." => "Gebruik niet voor SSL connecties, deze mislukken.",
 "Case insensitve LDAP server (Windows)" => "Niet-hoofdlettergevoelige LDAP server (Windows)",
 "Turn off SSL certificate validation." => "Schakel SSL certificaat validatie uit.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Als de connectie alleen werkt met deze optie, importeer dan het LDAP server SSL certificaat naar je ownCloud server.",
 "Not recommended, use for testing only." => "Niet aangeraden, gebruik alleen voor test doeleinden.",
 "in seconds. A change empties the cache." => "in seconden. Een verandering maakt de cache leeg.",
+"Directory Settings" => "Mapinstellingen",
 "User Display Name Field" => "Gebruikers Schermnaam Veld",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "Het te gebruiken LDAP attribuut voor het genereren van de ownCloud naam voor de gebruikers.",
 "Base User Tree" => "Basis Gebruikers Structuur",
 "One User Base DN per line" => "Een User Base DN per regel",
+"User Search Attributes" => "Attributen voor gebruikerszoekopdrachten",
 "Optional; one attribute per line" => "Optioneel; één attribuut per regel",
 "Group Display Name Field" => "Groep Schermnaam Veld",
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "Het te gebruiken LDAP attribuut voor het genereren van de ownCloud naam voor de groepen.",
 "Base Group Tree" => "Basis Groupen Structuur",
 "One Group Base DN per line" => "Een Group Base DN per regel",
+"Group Search Attributes" => "Attributen voor groepszoekopdrachten",
 "Group-Member association" => "Groepslid associatie",
+"Special Attributes" => "Speciale attributen",
 "in bytes" => "in bytes",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut.",
 "Help" => "Help"
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
index 83a8d1615ae..ef3f9140ef7 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -20,7 +20,6 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "bez żadnych symboli zastępczych np. \"objectClass=posixGroup\".",
 "Port" => "Port",
 "Use TLS" => "Użyj TLS",
-"Do not use it for SSL connections, it will fail." => "Nie używaj SSL dla połączeń, jeśli się nie powiedzie.",
 "Case insensitve LDAP server (Windows)" => "Wielkość liter serwera LDAP (Windows)",
 "Turn off SSL certificate validation." => "Wyłączyć sprawdzanie poprawności certyfikatu SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Jeśli połączenie działa tylko z tą opcją, zaimportuj certyfikat SSL serwera LDAP w serwerze ownCloud.",
diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php
index 79e56eeb652..514ceb7027e 100644
--- a/apps/user_ldap/l10n/pt_BR.php
+++ b/apps/user_ldap/l10n/pt_BR.php
@@ -19,7 +19,6 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "sem nenhum espaço reservado, ex.  \"objectClass=posixGroup\"",
 "Port" => "Porta",
 "Use TLS" => "Usar TLS",
-"Do not use it for SSL connections, it will fail." => "Não use-o para conexões SSL, pois falhará.",
 "Case insensitve LDAP server (Windows)" => "Servidor LDAP sensível à caixa alta (Windows)",
 "Turn off SSL certificate validation." => "Desligar validação de certificado SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se a conexão só funciona com essa opção, importe o certificado SSL do servidor LDAP no seu servidor ownCloud.",
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index 21735b497c6..058e7ba2532 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -33,6 +33,7 @@
 "Group Filter" => "Filtrar por grupo",
 "Defines the filter to apply, when retrieving groups." => "Defina o filtro a aplicar, ao recuperar grupos.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "Sem nenhuma variável. Exemplo: \"objectClass=posixGroup\".",
+"Connection Settings" => "Definições de ligação",
 "Configuration Active" => "Configuração activa",
 "When unchecked, this configuration will be skipped." => "Se não estiver marcada, esta definição não será tida em conta.",
 "Port" => "Porto",
@@ -42,12 +43,12 @@
 "Disable Main Server" => "Desactivar servidor principal",
 "When switched on, ownCloud will only connect to the replica server." => "Se estiver ligado, o ownCloud vai somente ligar-se a este servidor de réplicas.",
 "Use TLS" => "Usar TLS",
-"Do not use it for SSL connections, it will fail." => "Não use para ligações SSL, irá falhar.",
 "Case insensitve LDAP server (Windows)" => "Servidor LDAP (Windows) não sensível a maiúsculas.",
 "Turn off SSL certificate validation." => "Desligar a validação de certificado SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se a ligação apenas funcionar com está opção, importe o certificado SSL do servidor LDAP para o seu servidor do ownCloud.",
 "Not recommended, use for testing only." => "Não recomendado, utilizado apenas para testes!",
 "in seconds. A change empties the cache." => "em segundos. Uma alteração esvazia a cache.",
+"Directory Settings" => "Definições de directorias",
 "User Display Name Field" => "Mostrador do nome de utilizador.",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "Atributo LDAP para gerar o nome de utilizador do ownCloud.",
 "Base User Tree" => "Base da árvore de utilizadores.",
@@ -60,6 +61,7 @@
 "One Group Base DN per line" => "Uma base de grupo DN por linha",
 "Group Search Attributes" => "Atributos de pesquisa de grupo",
 "Group-Member association" => "Associar utilizador ao grupo.",
+"Special Attributes" => "Atributos especiais",
 "in bytes" => "em bytes",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD.",
 "Help" => "Ajuda"
diff --git a/apps/user_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php
index 3e7e7500429..8f55a35b491 100644
--- a/apps/user_ldap/l10n/ro.php
+++ b/apps/user_ldap/l10n/ro.php
@@ -22,7 +22,6 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "fără substituenți, d.e. \"objectClass=posixGroup\"",
 "Port" => "Portul",
 "Use TLS" => "Utilizează TLS",
-"Do not use it for SSL connections, it will fail." => "A nu se utiliza pentru conexiuni SSL, va eșua.",
 "Case insensitve LDAP server (Windows)" => "Server LDAP insensibil la majuscule (Windows)",
 "Turn off SSL certificate validation." => "Oprește validarea certificatelor SSL ",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Dacă conexiunea lucrează doar cu această opțiune, importează certificatul SSL al serverului LDAP în serverul ownCloud.",
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index 45f6c171bf3..4c4b9708667 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -1,6 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Failed to delete the server configuration" => "Не удалось удалить конфигурацию сервера",
+"The configuration is valid and the connection could be established!" => "Конфигурация правильная и подключение может быть установлено!",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Конфигурация не верна. Пожалуйста, посмотрите в журнале ownCloud детали.",
 "Deletion failed" => "Удаление не удалось",
+"Take over settings from recent server configuration?" => "Принять настройки из последней конфигурации сервера?",
+"Keep settings?" => "Сохранить настройки?",
+"Cannot add server configuration" => "Не получилось добавить конфигурацию сервера",
+"Connection test succeeded" => "Проверка соединения удалась",
+"Connection test failed" => "Проверка соединения не удалась",
+"Do you really want to delete the current Server Configuration?" => "Вы действительно хотите удалить существующую конфигурацию сервера?",
+"Confirm Deletion" => "Подтверждение удаления",
 "<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 несовместимы. Вы можете столкнуться с неожиданным поведением. Пожалуйста, обратитесь к системному администратору, чтобы отключить одно из них.",
+"Server configuration" => "Конфигурация сервера",
+"Add Server Configuration" => "Добавить конфигурацию сервера",
 "Host" => "Сервер",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Можно опустить протокол, за исключением того, когда вам требуется SSL. Тогда начните с ldaps :/ /",
 "Base DN" => "Базовый DN",
@@ -18,21 +30,27 @@
 "Group Filter" => "Фильтр группы",
 "Defines the filter to apply, when retrieving groups." => "Определяет фильтр для применения при получении группы.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "без заполнения, например \"objectClass=posixGroup\".",
+"Connection Settings" => "Настройки подключения",
+"Configuration Active" => "Конфигурация активна",
 "Port" => "Порт",
+"Disable Main Server" => "Отключение главного сервера",
 "Use TLS" => "Использовать TLS",
-"Do not use it for SSL connections, it will fail." => "Не используйте для соединений SSL",
 "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." => "Если соединение работает только с этой опцией, импортируйте на ваш сервер ownCloud сертификат SSL сервера LDAP.",
 "Not recommended, use for testing only." => "Не рекомендуется, используйте только для тестирования.",
 "in seconds. A change empties the cache." => "в секундах. Изменение очистит кэш.",
+"Directory Settings" => "Настройки каталога",
 "User Display Name Field" => "Поле отображаемого имени пользователя",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "Атрибут LDAP для генерации имени пользователя ownCloud.",
 "Base User Tree" => "База пользовательского дерева",
+"User Search Attributes" => "Поисковые атрибуты пользователя",
+"Optional; one attribute per line" => "Опционально; один атрибут на линию",
 "Group Display Name Field" => "Поле отображаемого имени группы",
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "Атрибут LDAP для генерации имени группы ownCloud.",
 "Base Group Tree" => "База группового дерева",
 "Group-Member association" => "Ассоциация Группа-Участник",
+"Special Attributes" => "Специальные атрибуты",
 "in bytes" => "в байтах",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Оставьте имя пользователя пустым (по умолчанию). Иначе укажите атрибут LDAP/AD.",
 "Help" => "Помощь"
diff --git a/apps/user_ldap/l10n/ru_RU.php b/apps/user_ldap/l10n/ru_RU.php
index f62d2cd4eaf..a4ed503b1d1 100644
--- a/apps/user_ldap/l10n/ru_RU.php
+++ b/apps/user_ldap/l10n/ru_RU.php
@@ -22,7 +22,6 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "без каких-либо заполнителей, например, \"objectClass=posixGroup\".",
 "Port" => "Порт",
 "Use TLS" => "Использовать TLS",
-"Do not use it for SSL connections, it will fail." => "Не используйте это SSL-соединений, это не будет выполнено.",
 "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 сервер.",
diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index 77cb039c7ed..af8ff0307a7 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -43,7 +43,6 @@
 "Disable Main Server" => "Zakázať hlavný server",
 "When switched on, ownCloud will only connect to the replica server." => "Pri zapnutí sa ownCloud pripojí len k záložnému serveru.",
 "Use TLS" => "Použi TLS",
-"Do not use it for SSL connections, it will fail." => "Nepoužívajte pre pripojenie SSL, pripojenie zlyhá.",
 "Case insensitve LDAP server (Windows)" => "LDAP server nerozlišuje veľkosť znakov (Windows)",
 "Turn off SSL certificate validation." => "Vypnúť overovanie SSL certifikátu.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Ak pripojenie pracuje len s touto možnosťou, tak importujte SSL certifikát LDAP serveru do vášho servera ownCloud.",
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index 133d7ee9119..e1734a90780 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -20,7 +20,6 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "Brez katerekoli vsebnika, npr. \"objectClass=posixGroup\".",
 "Port" => "Vrata",
 "Use TLS" => "Uporabi TLS",
-"Do not use it for SSL connections, it will fail." => "Uporaba SSL za povezave bo spodletela.",
 "Case insensitve LDAP server (Windows)" => "Strežnik LDAP ne upošteva velikosti črk (Windows)",
 "Turn off SSL certificate validation." => "Onemogoči potrditev veljavnosti potrdila SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "V primeru, da povezava deluje le s to možnostjo, uvozite potrdilo SSL iz strežnika LDAP na vaš strežnik ownCloud.",
diff --git a/apps/user_ldap/l10n/sr.php b/apps/user_ldap/l10n/sr.php
index 418d94afca5..52569a08ef8 100644
--- a/apps/user_ldap/l10n/sr.php
+++ b/apps/user_ldap/l10n/sr.php
@@ -18,7 +18,6 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "без икаквог чувара места, нпр. „objectClass=posixGroup“.",
 "Port" => "Порт",
 "Use TLS" => "Користи TLS",
-"Do not use it for SSL connections, it will fail." => "Не користите за SSL везе јер неће радити.",
 "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 ако веза ради само са овом опцијом.",
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index 509906934cb..c100fc94afe 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -43,7 +43,6 @@
 "Disable Main Server" => "Inaktivera huvudserver",
 "When switched on, ownCloud will only connect to the replica server." => "När denna är påkopplad kommer ownCloud att koppla upp till replika-servern, endast.",
 "Use TLS" => "Använd TLS",
-"Do not use it for SSL connections, it will fail." => "Använd inte för SSL-anslutningar, det kommer inte att fungera.",
 "Case insensitve LDAP server (Windows)" => "LDAP-servern är okänslig för gemener och versaler (Windows)",
 "Turn off SSL certificate validation." => "Stäng av verifiering av SSL-certifikat.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Om anslutningen bara fungerar med det här alternativet, importera LDAP-serverns SSL-certifikat i din ownCloud-server.",
diff --git a/apps/user_ldap/l10n/ta_LK.php b/apps/user_ldap/l10n/ta_LK.php
index d617f49700f..f6beb3c4863 100644
--- a/apps/user_ldap/l10n/ta_LK.php
+++ b/apps/user_ldap/l10n/ta_LK.php
@@ -9,7 +9,6 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "எந்த ஒதுக்கீடும் இல்லாமல், உதாரணம். \"objectClass=posixGroup\".",
 "Port" => "துறை ",
 "Use TLS" => "TLS ஐ பயன்படுத்தவும்",
-"Do not use it for SSL connections, it will fail." => "SSL இணைப்பிற்கு பயன்படுத்தவேண்டாம், அது தோல்வியடையும்.",
 "Case insensitve LDAP server (Windows)" => "உணர்ச்சியான LDAP சேவையகம் (சாளரங்கள்)",
 "Turn off SSL certificate validation." => "SSL சான்றிதழின் செல்லுபடியை நிறுத்திவிடவும்",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "இந்த தெரிவுகளில் மட்டும் இணைப்பு வேலைசெய்தால், உங்களுடைய owncloud சேவையகத்திலிருந்து LDAP சேவையகத்தின் SSL சான்றிதழை இறக்குமதி செய்யவும்",
diff --git a/apps/user_ldap/l10n/th_TH.php b/apps/user_ldap/l10n/th_TH.php
index 07dbc835b31..802badb2f03 100644
--- a/apps/user_ldap/l10n/th_TH.php
+++ b/apps/user_ldap/l10n/th_TH.php
@@ -36,7 +36,6 @@
 "Port" => "พอร์ต",
 "Disable Main Server" => "ปิดใช้งานเซิร์ฟเวอร์หลัก",
 "Use TLS" => "ใช้ TLS",
-"Do not use it for SSL connections, it will fail." => "กรุณาอย่าใช้การเชื่อมต่อแบบ SSL การเชื่อมต่อจะเกิดการล้มเหลว",
 "Case insensitve LDAP server (Windows)" => "เซิร์ฟเวอร์ LDAP ประเภท Case insensitive (วินโดวส์)",
 "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",
diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php
index 8ded27a2952..1bed9e246c9 100644
--- a/apps/user_ldap/l10n/tr.php
+++ b/apps/user_ldap/l10n/tr.php
@@ -12,7 +12,6 @@
 "Group Filter" => "Grup Süzgeci",
 "Port" => "Port",
 "Use TLS" => "TLS kullan",
-"Do not use it for SSL connections, it will fail." => "SSL bağlantıları ile kullanmayın, başarısız olacaktır.",
 "Turn off SSL certificate validation." => "SSL sertifika doğrulamasını kapat.",
 "Not recommended, use for testing only." => "Önerilmez, sadece test için kullanın.",
 "in seconds. A change empties the cache." => "saniye cinsinden. Bir değişiklik önbelleği temizleyecektir.",
diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php
index 4dd1256ee33..643a7495890 100644
--- a/apps/user_ldap/l10n/uk.php
+++ b/apps/user_ldap/l10n/uk.php
@@ -1,9 +1,24 @@
 <?php $TRANSLATIONS = array(
+"Failed to delete the server configuration" => "Не вдалося видалити конфігурацію сервера",
+"The configuration is valid and the connection could be established!" => "Конфігурація вірна і зв'язок може бути встановлений ​​!",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Конфігурація вірна, але встановити зв'язок не вдалося. Будь ласка, перевірте налаштування сервера і облікові дані.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Конфігурація невірна. Подробиці подивіться, будь ласка, в журналі ownCloud.",
 "Deletion failed" => "Видалення не було виконано",
+"Take over settings from recent server configuration?" => "Застосувати налаштування  з останньої конфігурації сервера ?",
+"Keep settings?" => "Зберегти налаштування ?",
+"Cannot add server configuration" => "Неможливо додати конфігурацію сервера",
+"Connection test succeeded" => "Перевірка з'єднання пройшла успішно",
+"Connection test failed" => "Перевірка з'єднання завершилась неуспішно",
+"Do you really want to delete the current Server Configuration?" => "Ви дійсно бажаєте видалити поточну конфігурацію сервера ?",
+"Confirm Deletion" => "Підтвердіть Видалення",
 "<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 не встановлено, базова програма працювати не буде. Будь ласка, зверніться до системного адміністратора, щоб встановити його.",
+"Server configuration" => "Налаштування Сервера",
+"Add Server Configuration" => "Додати налаштування Сервера",
 "Host" => "Хост",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://",
 "Base DN" => "Базовий DN",
+"One Base DN per line" => "Один Base DN на одній строчці",
 "You can specify Base DN for users and groups in the Advanced tab" => "Ви можете задати Базовий 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 і Пароль порожніми.",
@@ -18,9 +33,10 @@
 "Group Filter" => "Фільтр Груп",
 "Defines the filter to apply, when retrieving groups." => "Визначає фільтр, який застосовується при отриманні груп.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "без будь-якого заповнювача, наприклад: \"objectClass=posixGroup\".",
+"Configuration Active" => "Налаштування Активне",
+"When unchecked, this configuration will be skipped." => "Якщо \"галочка\" знята, ця конфігурація буде пропущена.",
 "Port" => "Порт",
 "Use TLS" => "Використовуйте TLS",
-"Do not use it for SSL connections, it will fail." => "Не використовуйте його для SSL з'єднань, це не буде виконано.",
 "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 сервер.",
@@ -29,9 +45,11 @@
 "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" => "Один Користувач Base 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" => "Одна Група Base DN на одній строчці",
 "Group-Member association" => "Асоціація Група-Член",
 "in bytes" => "в байтах",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD.",
diff --git a/apps/user_ldap/l10n/vi.php b/apps/user_ldap/l10n/vi.php
index 76ff6fe33a4..46054e4a4e2 100644
--- a/apps/user_ldap/l10n/vi.php
+++ b/apps/user_ldap/l10n/vi.php
@@ -19,7 +19,6 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "mà không giữ chỗ nào, ví dụ như \"objectClass = osixGroup\".",
 "Port" => "Cổng",
 "Use TLS" => "Sử dụng TLS",
-"Do not use it for SSL connections, it will fail." => "Kết nối SSL bị lỗi. ",
 "Case insensitve LDAP server (Windows)" => "Trường hợp insensitve LDAP máy chủ (Windows)",
 "Turn off SSL certificate validation." => "Tắt xác thực chứng nhận SSL",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "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.",
diff --git a/apps/user_ldap/l10n/zh_CN.GB2312.php b/apps/user_ldap/l10n/zh_CN.GB2312.php
index 91b059afd0b..f5bc41fd46b 100644
--- a/apps/user_ldap/l10n/zh_CN.GB2312.php
+++ b/apps/user_ldap/l10n/zh_CN.GB2312.php
@@ -19,7 +19,6 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "不能使用占位符，例如 \"objectClass=posixGroup\"。",
 "Port" => "端口",
 "Use TLS" => "使用 TLS",
-"Do not use it for SSL connections, it will fail." => "不要使用它进行 SSL 连接，会失败的。",
 "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." => "如果只有使用此选项才能连接，请导入 LDAP 服务器的 SSL 证书到您的 ownCloud 服务器。",
diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php
index d0c32e94e08..d494945e2e4 100644
--- a/apps/user_ldap/l10n/zh_CN.php
+++ b/apps/user_ldap/l10n/zh_CN.php
@@ -20,7 +20,6 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "无需占位符，例如\"objectClass=posixGroup\"",
 "Port" => "端口",
 "Use TLS" => "使用TLS",
-"Do not use it for SSL connections, it will fail." => "不要在SSL链接中使用此选项，会导致失败。",
 "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." => "如果链接仅在此选项时可用，在您的ownCloud服务器中导入LDAP服务器的SSL证书。",
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index acc33e047c6..f92779b1cad 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -409,6 +409,11 @@ class Connection {
 				$this->config[$key] = array();
 			}
 		}
+		if((strpos($this->config['ldapHost'], 'ldaps') === 0)
+			&& $this->config['ldapTLS']) {
+			$this->config['ldapTLS'] = false;
+			\OCP\Util::writeLog('user_ldap', 'LDAPS (already using secure connection) and TLS do not work together. Switched off TLS.', \OCP\Util::INFO);
+		}
 
 
 
@@ -523,7 +528,7 @@ class Connection {
 			if(!$this->config['ldapOverrideMainServer'] && !$this->getFromCache('overrideMainServer')) {
 				$this->doConnect($this->config['ldapHost'], $this->config['ldapPort']);
 				$bindStatus = $this->bind();
-				$error = ldap_errno($this->ldapConnectionRes);
+				$error = is_resource($this->ldapConnectionRes) ? ldap_errno($this->ldapConnectionRes) : -1;
 			} else {
 				$bindStatus = false;
 				$error = null;
@@ -547,6 +552,9 @@ class Connection {
 	}
 
 	private function doConnect($host, $port) {
+		if(empty($host)) {
+			return false;
+		}
 		$this->ldapConnectionRes = ldap_connect($host, $port);
 		if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_PROTOCOL_VERSION, 3)) {
 			if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_REFERRALS, 0)) {
@@ -564,9 +572,13 @@ class Connection {
 		if(!$this->config['ldapConfigurationActive']) {
 			return false;
 		}
-		$ldapLogin = @ldap_bind($this->getConnectionResource(), $this->config['ldapAgentName'], $this->config['ldapAgentPassword']);
+		$cr = $this->getConnectionResource();
+		if(!is_resource($cr)) {
+			return false;
+		}
+		$ldapLogin = @ldap_bind($cr, $this->config['ldapAgentName'], $this->config['ldapAgentPassword']);
 		if(!$ldapLogin) {
-			\OCP\Util::writeLog('user_ldap', 'Bind failed: ' . ldap_errno($this->ldapConnectionRes) . ': ' . ldap_error($this->ldapConnectionRes), \OCP\Util::ERROR);
+			\OCP\Util::writeLog('user_ldap', 'Bind failed: ' . ldap_errno($cr) . ': ' . ldap_error($cr), \OCP\Util::ERROR);
 			$this->ldapConnectionRes = null;
 			return false;
 		}
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index eb3840a611b..c6f1834e013 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -35,7 +35,7 @@
 				<p><label for="ldap_backup_host"><?php echo $l->t('Backup (Replica) Host');?></label><input type="text" id="ldap_backup_host" name="ldap_backup_host" data-default="<?php echo $_['ldap_backup_host_default']; ?>" title="<?php echo $l->t('Give an optional backup host. It must be a replica of the main LDAP/AD server.');?>"></p>
 				<p><label for="ldap_backup_port"><?php echo $l->t('Backup (Replica) Port');?></label><input type="number" id="ldap_backup_port" name="ldap_backup_port" data-default="<?php echo $_['ldap_backup_port_default']; ?>"  /></p>
 				<p><label for="ldap_override_main_server"><?php echo $l->t('Disable Main Server');?></label><input type="checkbox" id="ldap_override_main_server" name="ldap_override_main_server" value="1" data-default="<?php echo $_['ldap_override_main_server_default']; ?>"  title="<?php echo $l->t('When switched on, ownCloud will only connect to the replica server.');?>" /></p>
-				<p><label for="ldap_tls"><?php echo $l->t('Use TLS');?></label><input type="checkbox" id="ldap_tls" name="ldap_tls" value="1" data-default="<?php echo $_['ldap_tls_default']; ?>" title="<?php echo $l->t('Do not use it for SSL connections, it will fail.');?>" /></p>
+				<p><label for="ldap_tls"><?php echo $l->t('Use TLS');?></label><input type="checkbox" id="ldap_tls" name="ldap_tls" value="1" data-default="<?php echo $_['ldap_tls_default']; ?>" title="<?php echo $l->t('Do not use it additionally for LDAPS connections, it will fail.');?>" /></p>
 				<p><label for="ldap_nocase"><?php echo $l->t('Case insensitve LDAP server (Windows)');?></label><input type="checkbox" id="ldap_nocase" name="ldap_nocase" data-default="<?php echo $_['ldap_nocase_default']; ?>"  value="1"<?php if (isset($_['ldap_nocase']) && ($_['ldap_nocase'])) echo ' checked'; ?>></p>
 				<p><label for="ldap_turn_off_cert_check"><?php echo $l->t('Turn off SSL certificate validation.');?></label><input type="checkbox" id="ldap_turn_off_cert_check" name="ldap_turn_off_cert_check" title="<?php echo $l->t('If connection only works with this option, import the LDAP server\'s SSL certificate in your ownCloud server.');?>" data-default="<?php echo $_['ldap_turn_off_cert_check_default']; ?>" value="1"><br/><small><?php echo $l->t('Not recommended, use for testing only.');?></small></p>
 				<p><label for="ldap_cache_ttl">Cache Time-To-Live</label><input type="number" id="ldap_cache_ttl" name="ldap_cache_ttl" title="<?php echo $l->t('in seconds. A change empties the cache.');?>" data-default="<?php echo $_['ldap_cache_ttl_default']; ?>" /></p>
diff --git a/core/ajax/translations.php b/core/ajax/translations.php
index e22cbad4708..e52a2e9b1e8 100644
--- a/core/ajax/translations.php
+++ b/core/ajax/translations.php
@@ -22,6 +22,7 @@
 */
 
 $app = $_POST["app"];
+$app = OC_App::cleanAppId($app);
 
 $l = OC_L10N::get( $app );
 
diff --git a/core/ajax/vcategories/add.php b/core/ajax/vcategories/add.php
index 23d00af70ab..16a1461be08 100644
--- a/core/ajax/vcategories/add.php
+++ b/core/ajax/vcategories/add.php
@@ -34,7 +34,7 @@ debug(print_r($category, true));
 
 $categories = new OC_VCategories($type);
 if($categories->hasCategory($category)) {
-	bailOut(OC_Contacts_App::$l10n->t('This category already exists: '.$category));
+	bailOut($l->t('This category already exists: %s', array($category)));
 } else {
 	$categories->add($category, true);
 }
diff --git a/core/ajax/vcategories/removeFromFavorites.php b/core/ajax/vcategories/removeFromFavorites.php
index ba6e95c2497..78a528caa86 100644
--- a/core/ajax/vcategories/removeFromFavorites.php
+++ b/core/ajax/vcategories/removeFromFavorites.php
@@ -27,12 +27,12 @@ if(is_null($type)) {
 }
 
 if(is_null($id)) {
-	bailOut($l->t('%s ID not provided.', $type));
+	bailOut($l->t('%s ID not provided.', array($type)));
 }
 
 $categories = new OC_VCategories($type);
 if(!$categories->removeFromFavorites($id, $type)) {
-	bailOut($l->t('Error removing %s from favorites.', $id));
+	bailOut($l->t('Error removing %s from favorites.', array($id)));
 }
 
 OC_JSON::success();
diff --git a/core/css/styles.css b/core/css/styles.css
index 268040525bf..e6a4bf61995 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -59,25 +59,6 @@ input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#
 ::-webkit-scrollbar-thumb { background:#ddd; }
 
 
-#show { float: right; position: absolute; right: 1em; top: 0.8em; display:none; }
-#login form input[name="show"] + label { background: url("../img/actions/toggle.png") no-repeat; opacity:0.3;
-float: right; width: 24px; position: absolute !important; height: 14px; right: 1em; top: 1.25em;}
-#login form input[name="show"]:checked + label { background:url("../img/actions/toggle.png") no-repeat; opacity:0.8; }
-
-
-
-/* SHOW PASSWORD TOGGLE */
-#show {
-	position:absolute; right:1em; top:.8em; float:right;
-	display:none;
-}
-#login form input[name="show"] + label {
-	position:absolute !important; height:14px; width:24px; right:1em; top:1.25em; float:right;
-	background-image:url("../img/actions/toggle.png"); background-repeat:no-repeat; opacity:.3;
-}
-#login form input[name="show"]:checked + label { opacity:.8; }
-
-
 /* BUTTONS */
 input[type="submit"], input[type="button"], button, .button, #quota, div.jp-progress, select, .pager li a {
 	width:auto; padding:.4em;
@@ -166,17 +147,14 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 #login #datadirContent label { display:block; margin:0; color:#999;  }
 #login form #datadirField legend { margin-bottom:15px; }
 
-
 /* Icons for username and password fields to better recognize them */
 #adminlogin, #adminpass, #user, #password { width:11.7em!important; padding-left:1.8em; }
-#adminlogin+label+img, #adminpass+label+img, #user+label+img, #password+label+img {
+#adminlogin+label+img, #adminpass-icon, #user+label+img, #password-icon {
 	position:absolute; left:1.25em; top:1.65em;
 	opacity:.3;
 }
-#adminpass+label+img, #password+label+img { top:1.1em; }
+#adminpass-icon, #password-icon { top:1.1em; }
 input[name="password-clone"] { padding-left:1.8em; width:11.7em !important; }
-#pass_image { position: absolute; top: 1.2em; left: 1.4em; opacity: 0.3; }
-
 
 /* Nicely grouping input field sets */
 .grouptop input {
@@ -194,15 +172,28 @@ input[name="password-clone"] { padding-left:1.8em; width:11.7em !important; }
 	box-shadow:0 1px 1px #fff,0 1px 0 #ddd inset;
 }
 
+/* In field labels. No, HTML placeholder does not work as well. */
 #login form label { color:#666; }
 #login .groupmiddle label, #login .groupbottom label { top:.65em; }
-/* NEEDED FOR INFIELD LABELS */
 p.infield { position:relative; }
 label.infield { cursor:text !important; top:1.05em; left:.85em; }
 #login form label.infield { position:absolute; font-size:19px; color:#aaa; white-space:nowrap; padding-left:1.4em; }
+#login #databaseField .infield { padding-left:0; }
 #login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; }
 #login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }
 
+/* Show password toggle */
+#show {
+	position:absolute; right:1em; top:.8em; float:right;
+	display:none;
+}
+#show + label {
+	position:absolute!important; height:14px; width:24px; right:1em; top:1.25em!important;
+	background-image:url("../img/actions/toggle.png"); background-repeat:no-repeat; opacity:.3;
+}
+#show:checked + label { opacity:.8; }
+
+/* Database selector */
 #login form #selectDbType { text-align:center; }
 #login form #selectDbType label {
 	position:static; margin:0 -3px 5px; padding:.4em;
@@ -212,12 +203,14 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 }
 #login form #selectDbType label.ui-state-hover, #login form #selectDbType label.ui-state-active { color:#000; background-color:#e8e8e8; }
 
+/* Warnings */
 fieldset.warning {
 	padding:8px;
 	color:#b94a48; background-color:#f2dede; border:1px solid #eed3d7;
 	border-radius:5px;
 }
 fieldset.warning legend { color:#b94a48 !important; }
+fieldset.warning a { color:#b94a48 !important; font-weight:bold; }
 
 /* Alternative Logins */
 #alternative-logins legend { margin-bottom:10px; }
@@ -227,14 +220,14 @@ fieldset.warning legend { color:#b94a48 !important; }
 /* NAVIGATION ------------------------------------------------------------- */
 #navigation {
 	position:fixed; top:3.5em; float:left; width:64px; padding:0; z-index:75; height:100%;
-	background:#30343a url('../img/noise.png') repeat; border-right:1px #333 solid;
+	background:#383c43 url('../img/noise.png') repeat; border-right:1px #333 solid;
 	-moz-box-shadow:0 0 7px #000; -webkit-box-shadow:0 0 7px #000; box-shadow:0 0 7px #000;
 	overflow-x:scroll;
 }
 #navigation a {
 	display:block; padding:8px 0 4px;
 	text-decoration:none; font-size:10px; text-align:center;
-	color:#fff; text-shadow:#000 0 -1px 0; opacity:.4;
+	color:#fff; text-shadow:#000 0 -1px 0; opacity:.5;
 	white-space:nowrap; overflow:hidden; text-overflow:ellipsis; // ellipsize long app names
 }
 	#navigation a:hover, #navigation a:focus { opacity:.8; }
@@ -326,6 +319,8 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
 .arrow.left { left:-13px; bottom:1.2em; -webkit-transform:rotate(270deg); -moz-transform:rotate(270deg); -o-transform:rotate(270deg); -ms-transform:rotate(270deg); transform:rotate(270deg); }
 .arrow.up { top:-8px; right:2em; }
 .arrow.down { -webkit-transform:rotate(180deg); -moz-transform:rotate(180deg); -o-transform:rotate(180deg); -ms-transform:rotate(180deg); transform:rotate(180deg); }
+.help-includes {overflow: hidden; width: 100%; height: 100%; -moz-box-sizing: border-box;	box-sizing: border-box;	padding-top: 2.8em; }
+.help-iframe {width: 100%; height: 100%; margin: 0;padding: 0; border: 0; overflow: auto;}
 
 /* ---- BREADCRUMB ---- */
 div.crumb { float:left; display:block; background:url('../img/breadcrumb.svg') no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; }
diff --git a/core/img/filetypes/application.png b/core/img/filetypes/application.png
new file mode 100644
index 00000000000..1dee9e36609
--- /dev/null
+++ b/core/img/filetypes/application.png
diff --git a/core/js/js.js b/core/js/js.js
index 6b0c289850c..5f1870eb6ce 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -5,6 +5,12 @@
  * To the end of config/config.php to enable debug mode.
  * The undefined checks fix the broken ie8 console
  */
+var oc_debug;
+var oc_webroot;
+var oc_requesttoken;
+if (typeof oc_webroot === "undefined") {
+	oc_webroot = location.pathname.substr(0, location.pathname.lastIndexOf('/'));
+}
 if (oc_debug !== true || typeof console === "undefined" || typeof console.log === "undefined") {
 	if (!window.console) {
 		window.console = {};
diff --git a/core/js/setup.js b/core/js/setup.js
index 9aded6591ca..2656cac2f45 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -52,12 +52,10 @@ $(document).ready(function() {
 		// Save form parameters
 		var post = $(this).serializeArray();
 
-		// FIXME: This lines are breaking the installation
 		// Disable inputs
-		// $(':submit', this).attr('disabled','disabled').val('Finishing …');
-		// $('input', this).addClass('ui-state-disabled').attr('disabled','disabled');
-		// $('#selectDbType').button('disable');
-		// $('label.ui-button', this).addClass('ui-state-disabled').attr('aria-disabled', 'true').button('disable');
+		$(':submit', this).attr('disabled','disabled').val('Finishing …');
+		$('input', this).addClass('ui-state-disabled').attr('disabled','disabled');
+		$('#selectDbType').buttonset('disable');
 
 		// Create the form
 		var form = $('<form>');
diff --git a/core/js/share.js b/core/js/share.js
index 6ad4130690d..58cb787b6d1 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -185,10 +185,10 @@ OC.Share={
 				html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
 				html += '</div>';
 				html += '</div>';
-                html += '<form id="emailPrivateLink" >';
-                html += '<input id="email" style="display:none; width:65%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
-                html += '<input id="emailButton" style="display:none; float:right;" type="submit" value="'+t('core', 'Send')+'" />';
-                html += '</form>';
+				html += '<form id="emailPrivateLink" >';
+				html += '<input id="email" style="display:none; width:65%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
+				html += '<input id="emailButton" style="display:none; float:right;" type="submit" value="'+t('core', 'Send')+'" />';
+				html += '</form>';
 			}
 			html += '<div id="expiration">';
 			html += '<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" /><label for="expirationCheckbox">'+t('core', 'Set expiration date')+'</label>';
@@ -373,18 +373,18 @@ OC.Share={
 			$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
 		}
 		$('#expiration').show();
-        $('#emailPrivateLink #email').show();
-        $('#emailPrivateLink #emailButton').show();
+		$('#emailPrivateLink #email').show();
+		$('#emailPrivateLink #emailButton').show();
 	},
 	hideLink:function() {
 		$('#linkText').hide('blind');
 		$('#showPassword').hide();
 		$('#showPassword+label').hide();
 		$('#linkPass').hide();
-        $('#emailPrivateLink #email').hide();
-        $('#emailPrivateLink #emailButton').hide();
-    },
- 	dirname:function(path) {
+		$('#emailPrivateLink #email').hide();
+		$('#emailPrivateLink #emailButton').hide();
+	},
+	dirname:function(path) {
 		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
 	},
 	showExpirationDate:function(date) {
@@ -401,16 +401,16 @@ OC.Share={
 $(document).ready(function() {
 	
 	if(typeof monthNames != 'undefined'){
-	$.datepicker.setDefaults({
-		monthNames: monthNames,
-		monthNamesShort: $.map(monthNames, function(v) { return v.slice(0,3)+'.'; }),
-		dayNames: dayNames,
-		dayNamesMin: $.map(dayNames, function(v) { return v.slice(0,2); }),
-		dayNamesShort: $.map(dayNames, function(v) { return v.slice(0,3)+'.'; }),
-		firstDay: firstDay
-	});
-  }
-	$('#fileList').on('click', 'a.share', function(event) {
+		$.datepicker.setDefaults({
+			monthNames: monthNames,
+			monthNamesShort: $.map(monthNames, function(v) { return v.slice(0,3)+'.'; }),
+			dayNames: dayNames,
+			dayNamesMin: $.map(dayNames, function(v) { return v.slice(0,2); }),
+			dayNamesShort: $.map(dayNames, function(v) { return v.slice(0,3)+'.'; }),
+			firstDay: firstDay
+		});
+	}
+	$(document).on('click', 'a.share', function(event) {
 		event.stopPropagation();
 		if ($(this).data('item-type') !== undefined && $(this).data('item') !== undefined) {
 			var itemType = $(this).data('item-type');
@@ -444,12 +444,12 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#fileList').on('mouseenter', '#dropdown #shareWithList li', function(event) {
+	$(document).on('mouseenter', '#dropdown #shareWithList li', function(event) {
 		// Show permissions and unshare button
 		$(':hidden', this).filter(':not(.cruds)').show();
 	});
 
-	$('#fileList').on('mouseleave', '#dropdown #shareWithList li', function(event) {
+	$(document).on('mouseleave', '#dropdown #shareWithList li', function(event) {
 		// Hide permissions and unshare button
 		if (!$('.cruds', this).is(':visible')) {
 			$('a', this).hide();
@@ -462,11 +462,11 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#fileList').on('click', '#dropdown .showCruds', function() {
+	$(document).on('click', '#dropdown .showCruds', function() {
 		$(this).parent().find('.cruds').toggle();
 	});
 
-	$('#fileList').on('click', '#dropdown .unshare', function() {
+	$(document).on('click', '#dropdown .unshare', function() {
 		var li = $(this).parent();
 		var itemType = $('#dropdown').data('item-type');
 		var itemSource = $('#dropdown').data('item-source');
@@ -483,7 +483,7 @@ $(document).ready(function() {
 		});
 	});
 
-	$('#fileList').on('change', '#dropdown .permissions', function() {
+	$(document).on('change', '#dropdown .permissions', function() {
 		if ($(this).attr('name') == 'edit') {
 			var li = $(this).parent().parent()
 			var checkboxes = $('.permissions', li);
@@ -496,10 +496,17 @@ $(document).ready(function() {
 			var li = $(this).parent().parent().parent();
 			var checkboxes = $('.permissions', li);
 			// Uncheck Edit if Create, Update, and Delete are not checked
-			if (!$(this).is(':checked') && !$(checkboxes).filter('input[name="create"]').is(':checked') && !$(checkboxes).filter('input[name="update"]').is(':checked') && !$(checkboxes).filter('input[name="delete"]').is(':checked')) {
+			if (!$(this).is(':checked')
+				&& !$(checkboxes).filter('input[name="create"]').is(':checked')
+				&& !$(checkboxes).filter('input[name="update"]').is(':checked')
+				&& !$(checkboxes).filter('input[name="delete"]').is(':checked'))
+			{
 				$(checkboxes).filter('input[name="edit"]').attr('checked', false);
 			// Check Edit if Create, Update, or Delete is checked
-			} else if (($(this).attr('name') == 'create' || $(this).attr('name') == 'update' || $(this).attr('name') == 'delete')) {
+			} else if (($(this).attr('name') == 'create'
+					 || $(this).attr('name') == 'update'
+					 || $(this).attr('name') == 'delete'))
+			{
 				$(checkboxes).filter('input[name="edit"]').attr('checked', true);
 			}
 		}
@@ -507,10 +514,14 @@ $(document).ready(function() {
 		$(checkboxes).filter(':not(input[name="edit"])').filter(':checked').each(function(index, checkbox) {
 			permissions |= $(checkbox).data('permissions');
 		});
-		OC.Share.setPermissions($('#dropdown').data('item-type'), $('#dropdown').data('item-source'), $(li).data('share-type'), $(li).data('share-with'), permissions);
+		OC.Share.setPermissions($('#dropdown').data('item-type'),
+			$('#dropdown').data('item-source'),
+			$(li).data('share-type'),
+			$(li).data('share-with'),
+			permissions);
 	});
 
-	$('#fileList').on('change', '#dropdown #linkCheckbox', function() {
+	$(document).on('change', '#dropdown #linkCheckbox', function() {
 		var itemType = $('#dropdown').data('item-type');
 		var itemSource = $('#dropdown').data('item-source');
 		if (this.checked) {
@@ -532,12 +543,12 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#fileList').on('click', '#dropdown #linkText', function() {
+	$(document).on('click', '#dropdown #linkText', function() {
 		$(this).focus();
 		$(this).select();
 	});
 
-	$('#fileList').on('click', '#dropdown #showPassword', function() {
+	$(document).on('click', '#dropdown #showPassword', function() {
 		$('#linkPass').toggle('blind');
 		if (!$('#showPassword').is(':checked') ) {
 			var itemType = $('#dropdown').data('item-type');
@@ -548,7 +559,7 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#fileList').on('focusout keyup', '#dropdown #linkPassText', function(event) {
+	$(document).on('focusout keyup', '#dropdown #linkPassText', function(event) {
 		if ( $('#linkPassText').val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) {
 			var itemType = $('#dropdown').data('item-type');
 			var itemSource = $('#dropdown').data('item-source');
@@ -560,7 +571,7 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#fileList').on('click', '#dropdown #expirationCheckbox', function() {
+	$(document).on('click', '#dropdown #expirationCheckbox', function() {
 		if (this.checked) {
 			OC.Share.showExpirationDate('');
 		} else {
@@ -575,7 +586,7 @@ $(document).ready(function() {
 		}
 	});
 	
-	$('#fileList').on('change', '#dropdown #expirationDate', function() {
+	$(document).on('change', '#dropdown #expirationDate', function() {
 		var itemType = $('#dropdown').data('item-type');
 		var itemSource = $('#dropdown').data('item-source');
 		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: $(this).val() }, function(result) {
@@ -586,33 +597,33 @@ $(document).ready(function() {
 	});
 
 
-    $('#fileList').on('submit', '#dropdown #emailPrivateLink', function(event) {
-        event.preventDefault();
-        var link = $('#linkText').val();
-        var itemType = $('#dropdown').data('item-type');
-        var itemSource = $('#dropdown').data('item-source');
-        var file = $('tr').filterAttr('data-id', String(itemSource)).data('file');
-        var email = $('#email').val();
-        if (email != '') {
-            $('#email').attr('disabled', "disabled");
-            $('#email').val(t('core', 'Sending ...'));
-            $('#emailButton').attr('disabled', "disabled");
+	$(document).on('submit', '#dropdown #emailPrivateLink', function(event) {
+		event.preventDefault();
+		var link = $('#linkText').val();
+		var itemType = $('#dropdown').data('item-type');
+		var itemSource = $('#dropdown').data('item-source');
+		var file = $('tr').filterAttr('data-id', String(itemSource)).data('file');
+		var email = $('#email').val();
+		if (email != '') {
+			$('#email').attr('disabled', "disabled");
+			$('#email').val(t('core', 'Sending ...'));
+			$('#emailButton').attr('disabled', "disabled");
 
-            $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'email', toaddress: email, link: link, itemType: itemType, itemSource: itemSource, file: file},
-                function(result) {
-                    $('#email').attr('disabled', "false");
-                    $('#emailButton').attr('disabled', "false");
-                if (result && result.status == 'success') {
-                    $('#email').css('font-weight', 'bold');
-                    $('#email').animate({ fontWeight: 'normal' }, 2000, function() {
-                        $(this).val('');
-                    }).val(t('core','Email sent'));
-                } else {
-                    OC.dialogs.alert(result.data.message, t('core', 'Error while sharing'));
-                }
-            });
-        }
-    });
+			$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'email', toaddress: email, link: link, itemType: itemType, itemSource: itemSource, file: file},
+				function(result) {
+					$('#email').attr('disabled', "false");
+					$('#emailButton').attr('disabled', "false");
+				if (result && result.status == 'success') {
+					$('#email').css('font-weight', 'bold');
+					$('#email').animate({ fontWeight: 'normal' }, 2000, function() {
+						$(this).val('');
+					}).val(t('core','Email sent'));
+				} else {
+					OC.dialogs.alert(result.data.message, t('core', 'Error while sharing'));
+				}
+			});
+		}
+	});
 
 
 });
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 218eeed0722..67514723e75 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "No category to add?" => "ألا توجد فئة للإضافة؟",
-"This category already exists: " => "هذه الفئة موجودة مسبقاً",
 "No categories selected for deletion." => "لم يتم اختيار فئة للحذف",
 "Sunday" => "الاحد",
 "Monday" => "الأثنين",
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index deac6afa359..426b4856707 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s নামের ব্যবহারকারী \"%s\" ফোল্ডারটি আপনার সাথে ভাগাভাগি করেছেন। এটি এখন এখানে ডাউনলোড করার জন্য সুলভঃ %s",
 "Category type not provided." => "ক্যাটেগরির ধরণটি প্রদান করা হয় নি।",
 "No category to add?" => "যোগ করার মত কোন ক্যাটেগরি নেই ?",
-"This category already exists: " => "এই ক্যাটেগরিটি পূর্ব থেকেই বিদ্যমানঃ",
 "Object type not provided." => "অবজেক্টের ধরণটি প্রদান করা হয় নি।",
 "%s ID not provided." => "%s ID প্রদান করা হয় নি।",
 "Error adding %s to favorites." => "প্রিয়তে %s যোগ করতে সমস্যা দেখা দিয়েছে।",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 780366aaf0e..c60a818a4ee 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -5,7 +5,7 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "L'usuari %s ha compartit la carpeta \"%s\" amb vós. Està disponible per a la descàrrega a: %s",
 "Category type not provided." => "No s'ha especificat el tipus de categoria.",
 "No category to add?" => "No voleu afegir cap categoria?",
-"This category already exists: " => "Aquesta categoria ja existeix:",
+"This category already exists: %s" => "Aquesta categoria ja existeix: %s",
 "Object type not provided." => "No s'ha proporcionat el tipus d'objecte.",
 "%s ID not provided." => "No s'ha proporcionat la ID %s.",
 "Error adding %s to favorites." => "Error en afegir %s als preferits.",
@@ -109,7 +109,6 @@
 "Security Warning" => "Avís de seguretat",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "No està disponible el generador de nombres aleatoris segurs, habiliteu l'extensió de PHP OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sense un generador de nombres aleatoris segurs un atacant podria predir els senyals per restablir la contrasenya i prendre-us el compte.",
-"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." => "La carpeta de dades i els fitxers provablement són accessibles des d'internet. El fitxer .htaccess que proporciona ownCloud no funciona. Us recomanem que configureu el vostre servidor web de manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de la carpeta arrel del servidor web.",
 "Create an <strong>admin account</strong>" => "Crea un <strong>compte d'administrador</strong>",
 "Advanced" => "Avançat",
 "Data folder" => "Carpeta de dades",
@@ -129,6 +128,7 @@
 "Lost your password?" => "Heu perdut la contrasenya?",
 "remember" => "recorda'm",
 "Log in" => "Inici de sessió",
+"Alternative Logins" => "Acreditacions alternatives",
 "prev" => "anterior",
 "next" => "següent",
 "Updating ownCloud to version %s, this may take a while." => "S'està actualitzant ownCloud a la versió %s, pot trigar una estona."
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index a8fa035711c..c95854bc623 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -5,7 +5,7 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uživatel %s s vámi sdílí složku \"%s\". Můžete ji stáhnout zde: %s",
 "Category type not provided." => "Nezadán typ kategorie.",
 "No category to add?" => "Žádná kategorie k přidání?",
-"This category already exists: " => "Tato kategorie již existuje: ",
+"This category already exists: %s" => "Kategorie již existuje: %s",
 "Object type not provided." => "Nezadán typ objektu.",
 "%s ID not provided." => "Nezadáno ID %s.",
 "Error adding %s to favorites." => "Chyba při přidávání %s k oblíbeným.",
@@ -109,7 +109,6 @@
 "Security Warning" => "Bezpečnostní upozornění",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Není dostupný žádný bezpečný generátor náhodných čísel. Povolte, prosím, rozšíření OpenSSL v PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez bezpečného generátoru náhodných čísel může útočník předpovědět token pro obnovu hesla a převzít kontrolu nad Vaším účtem.",
-"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." => "Váš adresář dat a všechny Vaše soubory jsou pravděpodobně přístupné z internetu. Soubor .htaccess, který je poskytován ownCloud, nefunguje. Důrazně Vám doporučujeme nastavit váš webový server tak, aby nebyl adresář dat přístupný, nebo přesunout adresář dat mimo kořenovou složku dokumentů webového serveru.",
 "Create an <strong>admin account</strong>" => "Vytvořit <strong>účet správce</strong>",
 "Advanced" => "Pokročilé",
 "Data folder" => "Složka s daty",
@@ -129,6 +128,7 @@
 "Lost your password?" => "Ztratili jste své heslo?",
 "remember" => "zapamatovat si",
 "Log in" => "Přihlásit",
+"Alternative Logins" => "Alternativní přihlášení",
 "prev" => "předchozí",
 "next" => "následující",
 "Updating ownCloud to version %s, this may take a while." => "Aktualizuji ownCloud na verzi %s, bude to chvíli trvat."
diff --git a/core/l10n/da.php b/core/l10n/da.php
index ca23b622289..ebe4808544b 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Bruger %s delte mappe \"%s\" med dig. Det kan hentes her: %s",
 "Category type not provided." => "Kategori typen ikke er fastsat.",
 "No category to add?" => "Ingen kategori at tilføje?",
-"This category already exists: " => "Denne kategori eksisterer allerede: ",
 "Object type not provided." => "Object type ikke er fastsat.",
 "%s ID not provided." => "%s ID ikke oplyst.",
 "Error adding %s to favorites." => "Fejl ved tilføjelse af %s til favoritter.",
@@ -108,7 +107,6 @@
 "Security Warning" => "Sikkerhedsadvarsel",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen sikker tilfældighedsgenerator til tal er tilgængelig. Aktiver venligst OpenSSL udvidelsen.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Uden en sikker tilfældighedsgenerator til tal kan en angriber måske gætte dit gendan kodeord og overtage din konto",
-"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." => "Din data mappe og dine filer er muligvis tilgængelige fra internettet. .htaccess filen som ownCloud leverer virker ikke. Vi anbefaler på det kraftigste at du konfigurerer din webserver på en måske så data mappen ikke  længere er tilgængelig eller at du flytter data mappen uden for webserverens dokument rod.  ",
 "Create an <strong>admin account</strong>" => "Opret en <strong>administratorkonto</strong>",
 "Advanced" => "Avanceret",
 "Data folder" => "Datamappe",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index bc7a7dada1d..d14af6639c9 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat eine Verzeichnis \"%s\" für Dich freigegeben. Es ist zum Download hier ferfügbar: %s",
 "Category type not provided." => "Kategorie nicht angegeben.",
 "No category to add?" => "Keine Kategorie hinzuzufügen?",
-"This category already exists: " => "Kategorie existiert bereits:",
 "Object type not provided." => "Objekttyp nicht angegeben.",
 "%s ID not provided." => "%s ID nicht angegeben.",
 "Error adding %s to favorites." => "Fehler beim Hinzufügen von %s zu den Favoriten.",
@@ -109,7 +108,6 @@
 "Security Warning" => "Sicherheitswarnung",
 "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 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." => "Dein Datenverzeichnis und deine Datein sind vielleicht vom Internet aus erreichbar. Die .htaccess Datei, die ownCloud verwendet, arbeitet nicht richtig. Wir schlagen Dir dringend vor, dass du deinen Webserver so konfigurierst, dass das Datenverzeichnis nicht länger erreichbar ist oder, dass du dein Datenverzeichnis aus dem Dokumenten-root des Webservers bewegst.",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
 "Advanced" => "Fortgeschritten",
 "Data folder" => "Datenverzeichnis",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index ca5b843a832..fdebfeb6587 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -5,7 +5,7 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat eine Verzeichnis \"%s\" für Sie freigegeben. Es ist zum Download hier ferfügbar: %s",
 "Category type not provided." => "Kategorie nicht angegeben.",
 "No category to add?" => "Keine Kategorie hinzuzufügen?",
-"This category already exists: " => "Kategorie existiert bereits:",
+"This category already exists: %s" => "Die Kategorie '%s' existiert bereits.",
 "Object type not provided." => "Objekttyp nicht angegeben.",
 "%s ID not provided." => "%s ID nicht angegeben.",
 "Error adding %s to favorites." => "Fehler beim Hinzufügen von %s zu den Favoriten.",
@@ -109,7 +109,6 @@
 "Security Warning" => "Sicherheitshinweis",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktivieren Sie 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 Ihr Konto zu übernehmen.",
-"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." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich über das Internet erreichbar. Die von ownCloud bereitgestellte .htaccess Datei funktioniert nicht. Wir empfehlen Ihnen dringend, Ihren Webserver so zu konfigurieren, dass das Datenverzeichnis nicht mehr über das Internet erreichbar ist. Alternativ können Sie auch das Datenverzeichnis aus dem Dokumentenverzeichnis des Webservers verschieben.",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
 "Advanced" => "Fortgeschritten",
 "Data folder" => "Datenverzeichnis",
@@ -129,6 +128,7 @@
 "Lost your password?" => "Passwort vergessen?",
 "remember" => "merken",
 "Log in" => "Einloggen",
+"Alternative Logins" => "Alternative Logins",
 "prev" => "Zurück",
 "next" => "Weiter",
 "Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 74ec378b9df..01c6eb818a2 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Ο χρήστης %s διαμοιράστηκε τον φάκελο \"%s\" μαζί σας. Είναι διαθέσιμος για λήψη εδώ: %s",
 "Category type not provided." => "Δεν δώθηκε τύπος κατηγορίας.",
 "No category to add?" => "Δεν έχετε κατηγορία να προσθέσετε;",
-"This category already exists: " => "Αυτή η κατηγορία υπάρχει ήδη:",
 "Object type not provided." => "Δεν δώθηκε τύπος αντικειμένου.",
 "%s ID not provided." => "Δεν δώθηκε η ID για %s.",
 "Error adding %s to favorites." => "Σφάλμα προσθήκης %s στα αγαπημένα.",
@@ -106,7 +105,6 @@
 "Security Warning" => "Προειδοποίηση Ασφαλείας",
 "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." => "Χωρίς το πρόσθετο δημιουργίας τυχαίων αριθμών ασφαλείας, μπορεί να διαρρεύσει ο λογαριασμός σας από επιθέσεις στο διαδίκτυο.",
-"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." => "Ο κατάλογος data και τα αρχεία σας πιθανόν να είναι διαθέσιμα στο διαδίκτυο. Το αρχείο .htaccess που παρέχει το ownCloud δεν δουλεύει. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος data να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο data έξω από τον κατάλογο του διακομιστή.",
 "Create an <strong>admin account</strong>" => "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>",
 "Advanced" => "Για προχωρημένους",
 "Data folder" => "Φάκελος δεδομένων",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 7c0e65f4e03..f2297bd3d97 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "La uzanto %s kunhavigis la dosierujon “%s” kun vi. Ĝi elŝuteblas el tie ĉi: %s",
 "Category type not provided." => "Ne proviziĝis tipon de kategorio.",
 "No category to add?" => "Ĉu neniu kategorio estas aldonota?",
-"This category already exists: " => "Ĉi tiu kategorio jam ekzistas: ",
 "Object type not provided." => "Ne proviziĝis tipon de objekto.",
 "%s ID not provided." => "Ne proviziĝis ID-on de %s.",
 "Error adding %s to favorites." => "Eraro dum aldono de %s al favoratoj.",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index e046e3bf7a0..a95d408a0be 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -5,7 +5,7 @@
 "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.",
 "No category to add?" => "¿Ninguna categoría para añadir?",
-"This category already exists: " => "Esta categoría ya existe: ",
+"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.",
 "Error adding %s to favorites." => "Error añadiendo %s a los favoritos.",
@@ -109,7 +109,6 @@
 "Security Warning" => "Advertencia de seguridad",
 "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 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." => "Su directorio de datos y sus archivos están probablemente accesibles desde internet. El archivo .htaccess que ownCloud provee no está funcionando. Sugerimos fuertemente que configure su servidor web de manera que el directorio de datos ya no esté accesible o mueva el directorio de datos fuera del documento raíz de su servidor web.",
 "Create an <strong>admin account</strong>" => "Crea una <strong>cuenta de administrador</strong>",
 "Advanced" => "Avanzado",
 "Data folder" => "Directorio de almacenamiento",
@@ -129,6 +128,7 @@
 "Lost your password?" => "¿Has perdido tu contraseña?",
 "remember" => "recuérdame",
 "Log in" => "Entrar",
+"Alternative Logins" => "Nombre de usuarios alternativos",
 "prev" => "anterior",
 "next" => "siguiente",
 "Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo."
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 1ce26416f6e..819e52a7856 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "El usuario %s compartió el archivo \"%s\" con vos. Está disponible para su descarga aquí: %s",
 "Category type not provided." => "Tipo de categoría no provisto. ",
 "No category to add?" => "¿Ninguna categoría para añadir?",
-"This category already exists: " => "Esta categoría ya existe: ",
 "Object type not provided." => "Tipo de objeto no provisto. ",
 "%s ID not provided." => "%s ID no provista. ",
 "Error adding %s to favorites." => "Error al agregar %s a favoritos. ",
@@ -109,7 +108,6 @@
 "Security Warning" => "Advertencia de seguridad",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "No hay disponible ningún generador de números aleatorios seguro. Por favor habilitá 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 tu contraseña y tomar control de tu cuenta.",
-"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." => "Tu directorio de datos y tus archivos son probablemente accesibles desde internet. El archivo .htaccess provisto por ownCloud no está funcionando. Te sugerimos que configures tu servidor web de manera que el directorio de datos ya no esté accesible, o que muevas el directorio de datos afuera del directorio raíz de tu servidor web.",
 "Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
 "Advanced" => "Avanzado",
 "Data folder" => "Directorio de almacenamiento",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index f4328de9901..b0fc75736a0 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "No category to add?" => "Pole kategooriat, mida lisada?",
-"This category already exists: " => "See kategooria on juba olemas: ",
 "No categories selected for deletion." => "Kustutamiseks pole kategooriat valitud.",
 "Sunday" => "Pühapäev",
 "Monday" => "Esmaspäev",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index ed919d64d9d..7dce8c53fb9 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s erabiltzaileak \"%s\" karpeta zurekin partekatu du. Hemen duzu eskuragarri:  %s",
 "Category type not provided." => "Kategoria mota ez da zehaztu.",
 "No category to add?" => "Ez dago gehitzeko kategoriarik?",
-"This category already exists: " => "Kategoria hau dagoeneko existitzen da:",
 "Object type not provided." => "Objetu mota ez da zehaztu.",
 "%s ID not provided." => "%s ID mota ez da zehaztu.",
 "Error adding %s to favorites." => "Errorea gertatu da %s gogokoetara gehitzean.",
@@ -109,7 +108,6 @@
 "Security Warning" => "Segurtasun abisua",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ez dago hausazko zenbaki sortzaile segururik eskuragarri, mesedez gatiu PHP OpenSSL extensioa.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Hausazko zenbaki sortzaile segururik gabe erasotzaile batek pasahitza berrezartzeko kodeak iragarri ditzake eta zure kontuaz jabetu.",
-"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." => "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke. ownCloudek emandako .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea.",
 "Create an <strong>admin account</strong>" => "Sortu <strong>kudeatzaile kontu<strong> bat",
 "Advanced" => "Aurreratua",
 "Data folder" => "Datuen karpeta",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index 359eddb73ef..10a57962f64 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "کاربر %s پوشه \"%s\" را با شما به اشتراک گذاشته است. پرونده برای دانلود اینجاست : %s",
 "Category type not provided." => "نوع دسته بندی ارائه نشده است.",
 "No category to add?" => "آیا گروه دیگری برای افزودن ندارید",
-"This category already exists: " => "این گروه از قبل اضافه شده",
 "Object type not provided." => "نوع شی ارائه نشده است.",
 "%s ID not provided." => "شناسه %s  ارائه نشده است.",
 "Error adding %s to favorites." => "خطای اضافه کردن %s  به علاقه مندی ها.",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 1f2568f9513..dedbf6723f7 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -4,7 +4,6 @@
 "User %s shared the file \"%s\" with you. It is available for download here: %s" => "Käyttäjä %s jakoi tiedoston \"%s\" kanssasi. Se on ladattavissa täältä: %s",
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Käyttäjä %s jakoi kansion \"%s\" kanssasi. Se on ladattavissa täältä: %s",
 "No category to add?" => "Ei lisättävää luokkaa?",
-"This category already exists: " => "Tämä luokka on jo olemassa: ",
 "Error adding %s to favorites." => "Virhe lisätessä kohdetta %s suosikkeihin.",
 "No categories selected for deletion." => "Luokkia ei valittu poistettavaksi.",
 "Error removing %s from favorites." => "Virhe poistaessa kohdetta %s suosikeista.",
@@ -101,7 +100,6 @@
 "Edit categories" => "Muokkaa luokkia",
 "Add" => "Lisää",
 "Security Warning" => "Turvallisuusvaroitus",
-"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." => "Data-kansio ja tiedostot ovat ehkä saavutettavissa Internetistä. .htaccess-tiedosto, jolla kontrolloidaan pääsyä, ei toimi. Suosittelemme, että muutat web-palvelimesi asetukset niin ettei data-kansio ole enää pääsyä tai siirrät data-kansion pois web-palvelimen tiedostojen juuresta.",
 "Create an <strong>admin account</strong>" => "Luo <strong>ylläpitäjän tunnus</strong>",
 "Advanced" => "Lisäasetukset",
 "Data folder" => "Datakansio",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index e3b70836521..ad8ff0a6fca 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -5,7 +5,7 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "L'utilisateur %s a partagé le dossier \"%s\" avec vous. Il est disponible au téléchargement ici : %s",
 "Category type not provided." => "Type de catégorie non spécifié.",
 "No category to add?" => "Pas de catégorie à ajouter ?",
-"This category already exists: " => "Cette catégorie existe déjà : ",
+"This category already exists: %s" => "Cette catégorie existe déjà : %s",
 "Object type not provided." => "Type d'objet non spécifié.",
 "%s ID not provided." => "L'identifiant de %s n'est pas spécifié.",
 "Error adding %s to favorites." => "Erreur lors de l'ajout de %s aux favoris.",
@@ -109,7 +109,6 @@
 "Security Warning" => "Avertissement de sécurité",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Aucun générateur de nombre aléatoire sécurisé n'est disponible, veuillez activer l'extension PHP OpenSSL",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sans générateur de nombre aléatoire sécurisé, un attaquant peut être en mesure de prédire les jetons de réinitialisation du mot de passe, et ainsi prendre le contrôle de votre compte utilisateur.",
-"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." => "Votre dossier data et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess fourni par ownCloud ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de manière à ce que le dossier data ne soit plus accessible ou bien de déplacer le dossier data en dehors du dossier racine des documents du serveur web.",
 "Create an <strong>admin account</strong>" => "Créer un <strong>compte administrateur</strong>",
 "Advanced" => "Avancé",
 "Data folder" => "Répertoire des données",
@@ -129,6 +128,7 @@
 "Lost your password?" => "Mot de passe perdu ?",
 "remember" => "se souvenir de moi",
 "Log in" => "Connexion",
+"Alternative Logins" => "Logins alternatifs",
 "prev" => "précédent",
 "next" => "suivant",
 "Updating ownCloud to version %s, this may take a while." => "Mise à jour en cours d'ownCloud vers la version %s, cela peut prendre du temps."
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index e96d6962c90..8fd9292ce61 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "O usuario %s compartiu o cartafol «%s» con vostede. Teno dispoñíbel en: %s",
 "Category type not provided." => "Non se indicou o tipo de categoría",
 "No category to add?" => "Sen categoría que engadir?",
-"This category already exists: " => "Esta categoría xa existe: ",
 "Object type not provided." => "Non se forneceu o tipo de obxecto.",
 "%s ID not provided." => "Non se forneceu o ID %s.",
 "Error adding %s to favorites." => "Produciuse un erro ao engadir %s aos favoritos.",
@@ -106,7 +105,6 @@
 "Security Warning" => "Aviso de seguranza",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Non hai un xerador de números ao chou dispoñíbel. Active o engadido de OpenSSL para PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sen un xerador seguro de números ao chou podería acontecer que predicindo as cadeas de texto de reinicio de contrasinais se afagan coa súa conta.",
-"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." => "O seu cartafol de datos e os seus ficheiros probabelmente sexan accesíbeis a través da Internet. O ficheiro .htaccess que fornece ownCloud non está a empregarse. Suxerimoslle que configure o seu servidor web de tal xeito que o cartafol de datos non estea accesíbel ou mova o cartafol de datos fora do directorio raíz de datos do servidor web.",
 "Create an <strong>admin account</strong>" => "Crear unha <strong>contra de administrador</strong>",
 "Advanced" => "Avanzado",
 "Data folder" => "Cartafol de datos",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index b7292c6edee..75c378ceceb 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "המשתמש %s שיתף אתך את התיקייה „%s“. ניתן להוריד את התיקייה מכאן: %s",
 "Category type not provided." => "סוג הקטגוריה לא סופק.",
 "No category to add?" => "אין קטגוריה להוספה?",
-"This category already exists: " => "קטגוריה זאת כבר קיימת: ",
 "Object type not provided." => "סוג הפריט לא סופק.",
 "%s ID not provided." => "מזהה %s לא סופק.",
 "Error adding %s to favorites." => "אירעה שגיאה בעת הוספת %s למועדפים.",
@@ -106,7 +105,6 @@
 "Security Warning" => "אזהרת אבטחה",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "אין מחולל מספרים אקראיים מאובטח, נא להפעיל את ההרחבה OpenSSL ב־PHP.",
 "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 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." => "יתכן שתיקיית הנתונים והקבצים שלך נגישים דרך האינטרנט. קובץ ה־‎.htaccess שמסופק על ידי ownCloud כנראה אינו עובד. אנו ממליצים בחום להגדיר את שרת האינטרנט שלך בדרך שבה תיקיית הנתונים לא תהיה זמינה עוד או להעביר את תיקיית הנתונים מחוץ לספריית העל של שרת האינטרנט.",
 "Create an <strong>admin account</strong>" => "יצירת <strong>חשבון מנהל</strong>",
 "Advanced" => "מתקדם",
 "Data folder" => "תיקיית נתונים",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 78b767305a3..86136329d8f 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "No category to add?" => "Nemate kategorija koje možete dodati?",
-"This category already exists: " => "Ova kategorija već postoji: ",
 "No categories selected for deletion." => "Nema odabranih kategorija za brisanje.",
 "Sunday" => "nedelja",
 "Monday" => "ponedeljak",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 30ddc7b8677..fc71a669e89 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s felhasználó megosztotta ezt a mappát Önnel: %s. A mappa innen tölthető le: %s",
 "Category type not provided." => "Nincs megadva a kategória típusa.",
 "No category to add?" => "Nincs hozzáadandó kategória?",
-"This category already exists: " => "Ez a kategória már létezik: ",
 "Object type not provided." => "Az objektum típusa nincs megadva.",
 "%s ID not provided." => "%s ID nincs megadva.",
 "Error adding %s to favorites." => "Nem sikerült a kedvencekhez adni ezt: %s",
@@ -106,7 +105,6 @@
 "Security Warning" => "Biztonsági figyelmeztetés",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nem érhető el megfelelő véletlenszám-generátor, telepíteni kellene a PHP OpenSSL kiegészítését.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Megfelelő véletlenszám-generátor hiányában egy támadó szándékú idegen képes lehet megjósolni a jelszóvisszaállító tokent, és Ön helyett belépni.",
-"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." => "Az adatkönytára és az itt levő fájlok valószínűleg elérhetők az internetről. Az ownCloud által beillesztett .htaccess fájl nem működik. Nagyon fontos, hogy a webszervert úgy konfigurálja, hogy az adatkönyvtár nem legyen közvetlenül kívülről elérhető, vagy az adatkönyvtárt tegye a webszerver dokumentumfáján kívülre.",
 "Create an <strong>admin account</strong>" => "<strong>Rendszergazdai belépés</strong> létrehozása",
 "Advanced" => "Haladó",
 "Data folder" => "Adatkönyvtár",
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index 7f2eac17367..8adc38f0bba 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
-"This category already exists: " => "Iste categoria jam existe:",
 "Sunday" => "Dominica",
 "Monday" => "Lunedi",
 "Tuesday" => "Martedi",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 896d444e833..697195e7514 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "No category to add?" => "Tidak ada kategori yang akan ditambahkan?",
-"This category already exists: " => "Kategori ini sudah ada:",
 "No categories selected for deletion." => "Tidak ada kategori terpilih untuk penghapusan.",
 "Sunday" => "minggu",
 "Monday" => "senin",
diff --git a/core/l10n/is.php b/core/l10n/is.php
index 98766efc2c9..997a582d228 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Notandinn %s deildi möppunni \"%s\" með þér. Hægt er að hlaða henni niður hér: %s",
 "Category type not provided." => "Flokkur ekki gefin",
 "No category to add?" => "Enginn flokkur til að bæta við?",
-"This category already exists: " => "Þessi flokkur er þegar til:",
 "Object type not provided." => "Tegund ekki í boði.",
 "%s ID not provided." => "%s ID ekki í boði.",
 "Error adding %s to favorites." => "Villa við að bæta %s við eftirlæti.",
@@ -106,7 +105,6 @@
 "Security Warning" => "Öryggis aðvörun",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Enginn traustur slembitölugjafi í boði, vinsamlegast virkjaðu PHP OpenSSL viðbótina.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Án öruggs slembitölugjafa er mögulegt að sjá fyrir öryggis auðkenni til að endursetja lykilorð og komast inn á aðganginn þinn.",
-"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." => "Gagnamappan þín er að öllum líkindum aðgengileg frá internetinu. Skráin .htaccess sem fylgir með ownCloud er ekki að virka. Við mælum eindregið með því að þú stillir vefþjóninn þannig að gagnamappan verði ekki aðgengileg frá internetinu eða færir hana út fyrir vefrótina.",
 "Create an <strong>admin account</strong>" => "Útbúa <strong>vefstjóra aðgang</strong>",
 "Advanced" => "Ítarlegt",
 "Data folder" => "Gagnamappa",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index ec094f643a4..1068e0c31c7 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -5,7 +5,7 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "L'utente %s ha condiviso la cartella \"%s\" con te. È disponibile per lo scaricamento qui: %s",
 "Category type not provided." => "Tipo di categoria non fornito.",
 "No category to add?" => "Nessuna categoria da aggiungere?",
-"This category already exists: " => "Questa categoria esiste già: ",
+"This category already exists: %s" => "Questa categoria esiste già: %s",
 "Object type not provided." => "Tipo di oggetto non fornito.",
 "%s ID not provided." => "ID %s non fornito.",
 "Error adding %s to favorites." => "Errore durante l'aggiunta di %s ai preferiti.",
@@ -109,7 +109,6 @@
 "Security Warning" => "Avviso di sicurezza",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Non è disponibile alcun generatore di numeri casuali sicuro. Abilita l'estensione OpenSSL di PHP",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Senza un generatore di numeri casuali sicuro, un malintenzionato potrebbe riuscire a individuare i token di ripristino delle password e impossessarsi del tuo account.",
-"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." => "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet. Il file .htaccess fornito da ownCloud non funziona. Ti suggeriamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile o sposta tale cartella fuori dalla radice del sito.",
 "Create an <strong>admin account</strong>" => "Crea un <strong>account amministratore</strong>",
 "Advanced" => "Avanzate",
 "Data folder" => "Cartella dati",
@@ -129,6 +128,7 @@
 "Lost your password?" => "Hai perso la password?",
 "remember" => "ricorda",
 "Log in" => "Accedi",
+"Alternative Logins" => "Accessi alternativi",
 "prev" => "precedente",
 "next" => "successivo",
 "Updating ownCloud to version %s, this may take a while." => "Aggiornamento di ownCloud alla versione %s in corso, ciò potrebbe richiedere del tempo."
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 155c201d9b7..803faaf75a6 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -5,7 +5,7 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "ユーザ %s はあなたとフォルダ \"%s\" を共有しています。こちらからダウンロードできます: %s",
 "Category type not provided." => "カテゴリタイプは提供されていません。",
 "No category to add?" => "追加するカテゴリはありませんか？",
-"This category already exists: " => "このカテゴリはすでに存在します: ",
+"This category already exists: %s" => "このカテゴリはすでに存在します: %s",
 "Object type not provided." => "オブジェクトタイプは提供されていません。",
 "%s ID not provided." => "%s ID は提供されていません。",
 "Error adding %s to favorites." => "お気に入りに %s を追加エラー",
@@ -109,7 +109,6 @@
 "Security Warning" => "セキュリティ警告",
 "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." => "セキュアな乱数生成器が無い場合、攻撃者はパスワードリセットのトークンを予測してアカウントを乗っ取られる可能性があります。",
-"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." => "データディレクトリとファイルが恐らくインターネットからアクセスできるようになっています。ownCloudが提供する .htaccessファイルが機能していません。データディレクトリを全くアクセスできないようにするか、データディレクトリをウェブサーバのドキュメントルートの外に置くようにウェブサーバを設定することを強くお勧めします。 ",
 "Create an <strong>admin account</strong>" => "<strong>管理者アカウント</strong>を作成してください",
 "Advanced" => "詳細設定",
 "Data folder" => "データフォルダ",
@@ -129,6 +128,7 @@
 "Lost your password?" => "パスワードを忘れましたか？",
 "remember" => "パスワードを記憶する",
 "Log in" => "ログイン",
+"Alternative Logins" => "代替ログイン",
 "prev" => "前",
 "next" => "次",
 "Updating ownCloud to version %s, this may take a while." => "ownCloud をバージョン %s に更新しています、しばらくお待ち下さい。"
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index ab4045601f9..731a3534558 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "No category to add?" => "არ არის კატეგორია დასამატებლად?",
-"This category already exists: " => "კატეგორია უკვე არსებობს",
 "No categories selected for deletion." => "სარედაქტირებელი კატეგორია არ არის არჩეული ",
 "Sunday" => "კვირა",
 "Monday" => "ორშაბათი",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 91c00c4a570..172ec3e03a5 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s 님이 폴더 \"%s\"을(를) 공유하였습니다. 여기에서 다운로드할 수 있습니다: %s",
 "Category type not provided." => "분류 형식이 제공되지 않았습니다.",
 "No category to add?" => "추가할 분류가 없습니까?",
-"This category already exists: " => "이 분류는 이미 존재합니다:",
 "Object type not provided." => "객체 형식이 제공되지 않았습니다.",
 "%s ID not provided." => "%s ID가 제공되지 않았습니다.",
 "Error adding %s to favorites." => "책갈피에 %s을(를) 추가할 수 없었습니다.",
@@ -109,7 +108,6 @@
 "Security Warning" => "보안 경고",
 "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." => "안전한 난수 생성기를 사용하지 않으면 공격자가 암호 초기화 토큰을 추측하여 계정을 탈취할 수 있습니다.",
-"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." => "데이터 디렉터리와 파일을 인터넷에서 접근할 수 있는 것 같습니다. ownCloud에서 제공한 .htaccess 파일이 작동하지 않습니다. 웹 서버를 다시 설정하여 데이터 디렉터리에 접근할 수 없도록 하거나 문서 루트 바깥쪽으로 옮기는 것을 추천합니다.",
 "Create an <strong>admin account</strong>" => "<strong>관리자 계정</strong> 만들기",
 "Advanced" => "고급",
 "Data folder" => "데이터 폴더",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 4069a778365..11137f27aa2 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "No category to add?" => "Keng Kategorie fir bäizesetzen?",
-"This category already exists: " => "Des Kategorie existéiert schonn:",
 "No categories selected for deletion." => "Keng Kategorien ausgewielt fir ze läschen.",
 "Sunday" => "Sonndes",
 "Monday" => "Méindes",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index c2dc47c826c..563fd8884b0 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "No category to add?" => "Nepridėsite jokios kategorijos?",
-"This category already exists: " => "Tokia kategorija jau yra:",
 "No categories selected for deletion." => "Trynimui nepasirinkta jokia kategorija.",
 "Sunday" => "Sekmadienis",
 "Monday" => "Pirmadienis",
@@ -85,7 +84,6 @@
 "Security Warning" => "Saugumo pranešimas",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Saugaus atsitiktinių skaičių generatoriaus nėra, prašome įjungti PHP OpenSSL modulį.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Be saugaus atsitiktinių skaičių generatoriaus, piktavaliai gali atspėti Jūsų slaptažodį ir pasisavinti paskyrą.",
-"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." => "Jūsų duomenų aplankalas ir Jūsų failai turbūt yra pasiekiami per internetą. Failas .htaccess, kuris duodamas, neveikia. Mes rekomenduojame susitvarkyti savo nustatymsu taip, kad failai nebūtų pasiekiami per internetą, arba persikelti juos kitur.",
 "Create an <strong>admin account</strong>" => "Sukurti <strong>administratoriaus paskyrą</strong>",
 "Advanced" => "Išplėstiniai",
 "Data folder" => "Duomenų katalogas",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index a145c50464f..bc2306774aa 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -5,7 +5,7 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Lietotājs %s ar jums dalījās ar mapi “%s”. To var lejupielādēt šeit — %s",
 "Category type not provided." => "Kategorijas tips nav norādīts.",
 "No category to add?" => "Nav kategoriju, ko pievienot?",
-"This category already exists: " => "Šāda kategorija jau eksistē:",
+"This category already exists: %s" => "Šāda kategorija jau eksistē — %s",
 "Object type not provided." => "Objekta tips nav norādīts.",
 "%s ID not provided." => "%s ID nav norādīts.",
 "Error adding %s to favorites." => "Kļūda, pievienojot %s izlasei.",
@@ -109,7 +109,6 @@
 "Security Warning" => "Brīdinājums par drošību",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nav pieejams drošs nejaušu skaitļu ģenerators. Lūdzu, aktivējiet PHP OpenSSL paplašinājumu.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez droša nejaušu skaitļu ģeneratora uzbrucējs var paredzēt paroļu atjaunošanas marķierus un pārņem jūsu kontu.",
-"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." => "Jūsu datu direktorija un datnes visdrīzāk ir pieejamas no interneta. ownCloud nodrošinātā .htaccess datne nedarbojas. Mēs iesakām konfigurēt serveri tā, lai datu direktorija vairs nebūtu pieejama, vai arī pārvietojiet datu direktoriju ārpus tīmekļa servera dokumentu saknes.",
 "Create an <strong>admin account</strong>" => "Izveidot <strong>administratora kontu</strong>",
 "Advanced" => "Paplašināti",
 "Data folder" => "Datu mape",
@@ -129,6 +128,7 @@
 "Lost your password?" => "Aizmirsāt paroli?",
 "remember" => "atcerēties",
 "Log in" => "Ierakstīties",
+"Alternative Logins" => "Alternatīvās pieteikšanās",
 "prev" => "iepriekšējā",
 "next" => "nākamā",
 "Updating ownCloud to version %s, this may take a while." => "Atjaunina ownCloud uz versiju %s. Tas var aizņemt kādu laiciņu."
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 0b202fa6667..d9da7669004 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Корисникот %s ја сподели папката „%s“ со Вас. Достапна е за преземање тука: %s",
 "Category type not provided." => "Не беше доставен тип на категорија.",
 "No category to add?" => "Нема категорија да се додаде?",
-"This category already exists: " => "Оваа категорија веќе постои:",
 "Object type not provided." => "Не беше доставен тип на објект.",
 "%s ID not provided." => "%s ID не беше доставено.",
 "Error adding %s to favorites." => "Грешка при додавање %s во омилени.",
@@ -106,7 +105,6 @@
 "Security Warning" => "Безбедносно предупредување",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Не е достапен безбеден генератор на случајни броеви, Ве молам озвоможете го OpenSSL PHP додатокот.",
 "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 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." => "Вашата папка со податоци и датотеките е најверојатно достапна од интернет. .htaccess датотеката што ја овозможува ownCloud не фунционира. Силно препорачуваме да го исконфигурирате вашиот сервер за вашата папка со податоци не е достапна преку интернетт или преместете ја надвор од коренот на веб серверот.",
 "Create an <strong>admin account</strong>" => "Направете <strong>администраторска сметка</strong>",
 "Advanced" => "Напредно",
 "Data folder" => "Фолдер со податоци",
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index 477e82ea9f1..af51079b570 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "No category to add?" => "Tiada kategori untuk di tambah?",
-"This category already exists: " => "Kategori ini telah wujud",
 "No categories selected for deletion." => "tiada kategori dipilih untuk penghapusan",
 "Sunday" => "Ahad",
 "Monday" => "Isnin",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 65d6ea00cce..340625449ee 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "No category to add?" => "Ingen kategorier å legge til?",
-"This category already exists: " => "Denne kategorien finnes allerede:",
 "No categories selected for deletion." => "Ingen kategorier merket for sletting.",
 "Sunday" => "Søndag",
 "Monday" => "Mandag",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index aca9b11cd12..1dc8a9ca3be 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Gebruiker %s deelde de map \"%s\" met u. De map is hier beschikbaar voor download: %s",
 "Category type not provided." => "Categorie type niet opgegeven.",
 "No category to add?" => "Geen categorie toevoegen?",
-"This category already exists: " => "Deze categorie bestaat al.",
 "Object type not provided." => "Object type niet opgegeven.",
 "%s ID not provided." => "%s ID niet opgegeven.",
 "Error adding %s to favorites." => "Toevoegen van %s aan favorieten is mislukt.",
@@ -109,7 +108,6 @@
 "Security Warning" => "Beveiligingswaarschuwing",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Er kon geen willekeurig nummer worden gegenereerd. Zet de PHP OpenSSL extentie aan.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Zonder random nummer generator is het mogelijk voor een aanvaller om de reset tokens van wachtwoorden te voorspellen. Dit kan leiden tot het inbreken op uw account.",
-"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." => "Uw data is waarschijnlijk toegankelijk vanaf net internet. Het  .htaccess bestand dat ownCloud levert werkt niet goed. U wordt aangeraden om de configuratie van uw webserver zodanig aan te passen dat de data folders niet meer publiekelijk toegankelijk zijn. U kunt ook de data folder verplaatsen naar een folder buiten de webserver document folder.",
 "Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan",
 "Advanced" => "Geavanceerd",
 "Data folder" => "Gegevensmap",
@@ -129,6 +127,7 @@
 "Lost your password?" => "Uw wachtwoord vergeten?",
 "remember" => "onthoud gegevens",
 "Log in" => "Meld je aan",
+"Alternative Logins" => "Alternatieve inlogs",
 "prev" => "vorige",
 "next" => "volgende",
 "Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren."
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index 5b399dd8264..abd5f5736af 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "No category to add?" => "Pas de categoria d'ajustar ?",
-"This category already exists: " => "La categoria exista ja :",
 "No categories selected for deletion." => "Pas de categorias seleccionadas per escafar.",
 "Sunday" => "Dimenge",
 "Monday" => "Diluns",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 1376fa1359d..682289326dd 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uzytkownik %s wspóldzieli folder \"%s\" z toba. Jest dostepny tutaj: %s",
 "Category type not provided." => "Typ kategorii nie podany.",
 "No category to add?" => "Brak kategorii",
-"This category already exists: " => "Ta kategoria już istnieje",
 "Object type not provided." => "Typ obiektu nie podany.",
 "%s ID not provided." => "%s ID nie podany.",
 "Error adding %s to favorites." => "Błąd dodania %s do ulubionych.",
@@ -107,7 +106,6 @@
 "Security Warning" => "Ostrzeżenie o zabezpieczeniach",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Niedostępny bezpieczny generator liczb losowych, należy włączyć rozszerzenie OpenSSL w PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez bezpiecznego generatora liczb losowych, osoba atakująca może być w stanie przewidzieć resetujące hasło tokena i przejąć kontrolę nad swoim kontem.",
-"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." => "Katalog danych (data) i pliki są prawdopodobnie dostępnego z Internetu. Sprawdź plik .htaccess oraz konfigurację serwera (hosta). Sugerujemy, skonfiguruj swój serwer w taki sposób, żeby dane katalogu nie były dostępne lub przenieść katalog danych spoza głównego dokumentu webserwera.",
 "Create an <strong>admin account</strong>" => "Tworzenie <strong>konta administratora</strong>",
 "Advanced" => "Zaawansowane",
 "Data folder" => "Katalog danych",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 929f298c4c3..0d440f4c9d3 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "O usuário %s compartilhou com você a pasta \"%s\", que está disponível para download em: %s",
 "Category type not provided." => "Tipo de categoria não fornecido.",
 "No category to add?" => "Nenhuma categoria adicionada?",
-"This category already exists: " => "Essa categoria já existe",
 "Object type not provided." => "tipo de objeto não fornecido.",
 "%s ID not provided." => "%s ID não fornecido(s).",
 "Error adding %s to favorites." => "Erro ao adicionar %s aos favoritos.",
@@ -109,7 +108,6 @@
 "Security Warning" => "Aviso de Segurança",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nenhum gerador de número aleatório de segurança disponível. Habilite a extensão OpenSSL do PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sem um gerador de número aleatório de segurança, um invasor pode ser capaz de prever os símbolos de redefinição de senhas e assumir sua conta.",
-"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." => "Seu diretório de dados e seus arquivos estão, provavelmente, acessíveis a partir da internet. O .htaccess que o ownCloud fornece não está funcionando. Nós sugerimos que você configure o seu servidor web de uma forma que o diretório de dados esteja mais acessível ou que você mova o diretório de dados para fora da raiz do servidor web.",
 "Create an <strong>admin account</strong>" => "Criar uma <strong>conta</strong> de <strong>administrador</strong>",
 "Advanced" => "Avançado",
 "Data folder" => "Pasta de dados",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 2189a7e811c..3fb3361b2dc 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "O utilizador %s partilhou a pasta \"%s\" consigo. Está disponível para download aqui: %s",
 "Category type not provided." => "Tipo de categoria não fornecido",
 "No category to add?" => "Nenhuma categoria para adicionar?",
-"This category already exists: " => "Esta categoria já existe:",
 "Object type not provided." => "Tipo de objecto não fornecido",
 "%s ID not provided." => "ID %s não fornecido",
 "Error adding %s to favorites." => "Erro a adicionar %s aos favoritos",
@@ -109,7 +108,6 @@
 "Security Warning" => "Aviso de Segurança",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Não existe nenhum gerador seguro de números aleatórios, por favor, active a extensão OpenSSL no PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sem nenhum gerador seguro de números aleatórios, uma pessoa mal intencionada pode prever a sua password, reiniciar as seguranças adicionais e tomar conta da sua conta. ",
-"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." => "A sua pasta com os dados e os seus ficheiros estão provavelmente acessíveis a partir das internet. Sugerimos veementemente que configure o seu servidor web de maneira a que a pasta com os dados deixe de ficar acessível, ou mova a pasta com os dados para fora da raiz de documentos do servidor web.",
 "Create an <strong>admin account</strong>" => "Criar uma <strong>conta administrativa</strong>",
 "Advanced" => "Avançado",
 "Data folder" => "Pasta de dados",
@@ -129,6 +127,7 @@
 "Lost your password?" => "Esqueceu-se da sua password?",
 "remember" => "lembrar",
 "Log in" => "Entrar",
+"Alternative Logins" => "Contas de acesso alternativas",
 "prev" => "anterior",
 "next" => "seguinte",
 "Updating ownCloud to version %s, this may take a while." => "A actualizar o ownCloud para a versão %s, esta operação pode demorar."
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 83587fa4a76..da9f1a7da94 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Utilizatorul %s a partajat dosarul \"%s\" cu tine. Îl poți descărca de aici: %s ",
 "Category type not provided." => "Tipul de categorie nu este prevazut",
 "No category to add?" => "Nici o categorie de adăugat?",
-"This category already exists: " => "Această categorie deja există:",
 "Object type not provided." => "Tipul obiectului nu este prevazut",
 "%s ID not provided." => "ID-ul %s nu a fost introdus",
 "Error adding %s to favorites." => "Eroare la adăugarea %s la favorite",
@@ -106,7 +105,6 @@
 "Security Warning" => "Avertisment de securitate",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Generatorul de numere pentru securitate nu este disponibil, va rog activati extensia PHP OpenSSL",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Fara generatorul pentru numere de securitate , un atacator poate afla parola si reseta contul tau",
-"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." => "Directorul tău de date și fișierele tale probabil sunt accesibile prin internet. Fișierul .htaccess oferit de ownCloud nu funcționează. Îți recomandăm să configurezi server-ul tău web într-un mod în care directorul de date să nu mai fie accesibil sau mută directorul de date în afara directorului root al server-ului web.",
 "Create an <strong>admin account</strong>" => "Crează un <strong>cont de administrator</strong>",
 "Advanced" => "Avansat",
 "Data folder" => "Director date",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 7b11ea43a4b..0495f60d03f 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -5,7 +5,7 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Пользователь %s открыл вам доступ к папке \"%s\". Она доступна для загрузки здесь: %s",
 "Category type not provided." => "Тип категории не предоставлен",
 "No category to add?" => "Нет категорий для добавления?",
-"This category already exists: " => "Эта категория уже существует: ",
+"This category already exists: %s" => "Эта категория уже существует: %s",
 "Object type not provided." => "Тип объекта не предоставлен",
 "%s ID not provided." => "ID %s не  предоставлен",
 "Error adding %s to favorites." => "Ошибка добавления %s в избранное",
@@ -54,6 +54,7 @@
 "The app name is not specified." => "Имя приложения не указано",
 "The required file {file} is not installed!" => "Необходимый файл {file} не установлен!",
 "Share" => "Открыть доступ",
+"Shared" => "Общие",
 "Error while sharing" => "Ошибка при открытии доступа",
 "Error while unsharing" => "Ошибка при закрытии доступа",
 "Error while changing permissions" => "Ошибка при смене разрешений",
@@ -83,6 +84,8 @@
 "Error setting expiration date" => "Ошибка при установке срока доступа",
 "Sending ..." => "Отправляется ...",
 "Email sent" => "Письмо отправлено",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "При обновлении произошла ошибка. Пожалуйста сообщите об этом в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud сообщество</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud...",
 "ownCloud password reset" => "Сброс пароля ",
 "Use the following link to reset your password: {link}" => "Используйте следующую ссылку чтобы сбросить пароль: {link}",
 "You will receive a link to reset your password via Email." => "На ваш адрес Email выслана ссылка для сброса пароля.",
@@ -106,7 +109,6 @@
 "Security Warning" => "Предупреждение безопасности",
 "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." => "Без защищенного генератора случайных чисел злоумышленник может предугадать токены сброса пароля и завладеть Вашей учетной записью.",
-"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." => "Ваши каталоги данных и файлы, вероятно, доступны из Интернета. Файл .htaccess, предоставляемый ownCloud, не работает. Мы настоятельно рекомендуем Вам настроить вебсервер таким образом, чтобы каталоги данных больше не были доступны, или переместить их за пределы корневого каталога документов веб-сервера.",
 "Create an <strong>admin account</strong>" => "Создать <strong>учётную запись администратора</strong>",
 "Advanced" => "Дополнительно",
 "Data folder" => "Директория с данными",
@@ -126,6 +128,7 @@
 "Lost your password?" => "Забыли пароль?",
 "remember" => "запомнить",
 "Log in" => "Войти",
+"Alternative Logins" => "Альтернативные имена пользователя",
 "prev" => "пред",
 "next" => "след",
 "Updating ownCloud to version %s, this may take a while." => "Производится обновление ownCloud до версии %s. Это может занять некоторое время."
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index 53a3b9b0d59..fad6ebeddcd 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -5,7 +5,7 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Пользователь %s открыл Вам доступ к папке \"%s\". Она доступена для загрузки здесь: %s",
 "Category type not provided." => "Тип категории не предоставлен.",
 "No category to add?" => "Нет категории для добавления?",
-"This category already exists: " => "Эта категория уже существует:",
+"This category already exists: %s" => "Эта категория уже существует: %s",
 "Object type not provided." => "Тип объекта не предоставлен.",
 "%s ID not provided." => "%s ID не предоставлен.",
 "Error adding %s to favorites." => "Ошибка добавления %s в избранное.",
@@ -109,7 +109,6 @@
 "Security Warning" => "Предупреждение системы безопасности",
 "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." => "Без защищенного генератора случайных чисел злоумышленник может спрогнозировать пароль, сбросить учетные данные и завладеть Вашим аккаунтом.",
-"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." => "Ваши каталоги данных и файлы, вероятно, доступны из Интернета. Файл .htaccess, предоставляемый ownCloud, не работает. Мы настоятельно рекомендуем Вам настроить вебсервер таким образом, чтобы каталоги данных больше не были доступны, или переместить их за пределы корневого каталога документов веб-сервера.",
 "Create an <strong>admin account</strong>" => "Создать <strong>admin account</strong>",
 "Advanced" => "Расширенный",
 "Data folder" => "Папка данных",
@@ -129,6 +128,7 @@
 "Lost your password?" => "Забыли пароль?",
 "remember" => "запомнить",
 "Log in" => "Войти",
+"Alternative Logins" => "Альтернативные Имена",
 "prev" => "предыдущий",
 "next" => "следующий",
 "Updating ownCloud to version %s, this may take a while." => "Обновление ownCloud до версии %s, это может занять некоторое время."
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index eab1ba10018..eaafca2f3f6 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -71,7 +71,6 @@
 "Add" => "එක් කරන්න",
 "Security Warning" => "ආරක්ෂක නිවේදනයක්",
 "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 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." => "ඔබගේ දත්ත ඩිරෙක්ටරිය හා ගොනුවලට අන්තර්ජාලයෙන් පිවිසිය හැක. ownCloud සපයා ඇති .htaccess ගොනුව ක්‍රියාකරන්නේ නැත. අපි තරයේ කියා සිටිනුයේ නම්, මෙම දත්ත හා ගොනු එසේ පිවිසීමට නොහැකි වන ලෙස ඔබේ වෙබ් සේවාදායකයා  වින්‍යාස කරන ලෙස හෝ එම ඩිරෙක්ටරිය වෙබ් මූලයෙන් පිටතට ගෙනයන ලෙසය.",
 "Advanced" => "දියුණු/උසස්",
 "Data folder" => "දත්ත ෆෝල්ඩරය",
 "Configure the database" => "දත්ත සමුදාය හැඩගැසීම",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index ad5ae0ea371..26f04c1bcea 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -5,7 +5,7 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Používateľ %s zdieľa s Vami adresár \"%s\".  Môžete si ho stiahnuť tu: %s",
 "Category type not provided." => "Neposkytnutý kategorický typ.",
 "No category to add?" => "Žiadna kategória pre pridanie?",
-"This category already exists: " => "Táto kategória už existuje:",
+"This category already exists: %s" => "Kategéria: %s už existuje.",
 "Object type not provided." => "Neposkytnutý typ objektu.",
 "%s ID not provided." => "%s ID neposkytnuté.",
 "Error adding %s to favorites." => "Chyba pri pridávaní %s do obľúbených položiek.",
@@ -109,7 +109,6 @@
 "Security Warning" => "Bezpečnostné varovanie",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nie je dostupný žiadny bezpečný generátor náhodných čísel, prosím, povoľte rozšírenie OpenSSL v PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez bezpečného generátora náhodných čísel môže útočník predpovedať token pre obnovu hesla a prevziať kontrolu nad vaším kontom.",
-"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." => "Váš priečinok s dátami a Vaše súbory sú pravdepodobne dostupné z internetu. .htaccess súbor dodávaný s inštaláciou ownCloud nespĺňa úlohu. Dôrazne Vám doporučujeme nakonfigurovať webserver takým spôsobom, aby dáta v priečinku neboli verejné, alebo presuňte dáta mimo štruktúry priečinkov webservera.",
 "Create an <strong>admin account</strong>" => "Vytvoriť <strong>administrátorský účet</strong>",
 "Advanced" => "Pokročilé",
 "Data folder" => "Priečinok dát",
@@ -129,6 +128,7 @@
 "Lost your password?" => "Zabudli ste heslo?",
 "remember" => "zapamätať",
 "Log in" => "Prihlásiť sa",
+"Alternative Logins" => "Altrnatívne loginy",
 "prev" => "späť",
 "next" => "ďalej",
 "Updating ownCloud to version %s, this may take a while." => "Aktualizujem ownCloud na verziu %s, môže to chvíľu trvať."
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 54cf817a7a0..2b5b02191ec 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uporanik %s je dal mapo \"%s\" v souporabo z vami. Prenesete je lahko tukaj: %s",
 "Category type not provided." => "Vrsta kategorije ni podana.",
 "No category to add?" => "Ni kategorije za dodajanje?",
-"This category already exists: " => "Ta kategorija že obstaja:",
 "Object type not provided." => "Vrsta predmeta ni podana.",
 "%s ID not provided." => "%s ID ni podan.",
 "Error adding %s to favorites." => "Napaka pri dodajanju %s med priljubljene.",
@@ -106,7 +105,6 @@
 "Security Warning" => "Varnostno opozorilo",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Na voljo ni varnega generatorja naključnih števil. Prosimo, če omogočite PHP OpenSSL razširitev.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Brez varnega generatorja naključnih števil lahko napadalec napove žetone za ponastavitev gesla, kar mu omogoča, da prevzame vaš ​​račun.",
-"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." => "Trenutno je dostop do podatkovne mape in datotek najverjetneje omogočen vsem uporabnikom na omrežju. Datoteka .htaccess, vključena v ownCloud namreč ni omogočena. Močno priporočamo nastavitev spletnega strežnika tako, da mapa podatkov ne bo javno dostopna ali pa, da jo prestavite ven iz korenske mape spletnega strežnika.",
 "Create an <strong>admin account</strong>" => "Ustvari <strong>skrbniški račun</strong>",
 "Advanced" => "Napredne možnosti",
 "Data folder" => "Mapa s podatki",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index ecd316b7cfb..557cb6a8aba 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -3,7 +3,6 @@
 "User %s shared a folder with you" => "Корисник %s дели са вама директоријум",
 "Category type not provided." => "Врста категорије није унет.",
 "No category to add?" => "Додати још неку категорију?",
-"This category already exists: " => "Категорија већ постоји:",
 "Object type not provided." => "Врста објекта није унета.",
 "%s ID not provided." => "%s ИД нису унети.",
 "Error adding %s to favorites." => "Грешка приликом додавања %s у омиљене.",
@@ -103,7 +102,6 @@
 "Security Warning" => "Сигурносно упозорење",
 "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." => "Без поузданог генератора случајнох бројева нападач лако може предвидети лозинку за поништавање кључа шифровања и отети вам налог.",
-"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." => "Тренутно су ваши подаци и датотеке доступне са интернета. Датотека .htaccess коју је обезбедио пакет ownCloud не функционише. Саветујемо вам да подесите веб сервер тако да директоријум са подацима не буде изложен или да га преместите изван коренског директоријума веб сервера.",
 "Create an <strong>admin account</strong>" => "Направи <strong>административни налог</strong>",
 "Advanced" => "Напредно",
 "Data folder" => "Фацикла података",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index a0dde652693..bc96c237134 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Användare %s delade mappen \"%s\" med dig. Den finns att ladda ner här: %s",
 "Category type not provided." => "Kategorityp inte angiven.",
 "No category to add?" => "Ingen kategori att lägga till?",
-"This category already exists: " => "Denna kategori finns redan:",
 "Object type not provided." => "Objekttyp inte angiven.",
 "%s ID not provided." => "%s ID inte angiven.",
 "Error adding %s to favorites." => "Fel vid tillägg av %s till favoriter.",
@@ -109,7 +108,6 @@
 "Security Warning" => "Säkerhetsvarning",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen säker slumptalsgenerator finns tillgänglig. Du bör aktivera PHP OpenSSL-tillägget.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Utan en säker slumptalsgenerator kan angripare få möjlighet att förutsäga lösenordsåterställningar och ta över ditt konto.",
-"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." => "Din datakatalog och dina filer är förmodligen tillgängliga från Internet. Den .htaccess-fil som ownCloud tillhandahåller fungerar inte. Vi rekommenderar starkt att du konfigurerar webbservern så att datakatalogen inte längre är tillgänglig eller att du flyttar datakatalogen utanför webbserverns dokument-root.",
 "Create an <strong>admin account</strong>" => "Skapa ett <strong>administratörskonto</strong>",
 "Advanced" => "Avancerat",
 "Data folder" => "Datamapp",
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index 2b8829c717f..f7ad09fbc7e 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Category type not provided." => "பிரிவு வகைகள் வழங்கப்படவில்லை",
 "No category to add?" => "சேர்ப்பதற்கான வகைகள் இல்லையா?",
-"This category already exists: " => "இந்த வகை ஏற்கனவே உள்ளது:",
 "Object type not provided." => "பொருள் வகை வழங்கப்படவில்லை",
 "%s ID not provided." => "%s ID வழங்கப்படவில்லை",
 "Error adding %s to favorites." => "விருப்பங்களுக்கு %s ஐ சேர்ப்பதில் வழு",
@@ -98,7 +97,6 @@
 "Security Warning" => "பாதுகாப்பு எச்சரிக்கை",
 "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." => "பாதுகாப்பான சீரற்ற எண்ணிக்கையான புறப்பாக்கி இல்லையெனின், தாக்குனரால் கடவுச்சொல் மீளமைப்பு அடையாளவில்லைகள் முன்மொழியப்பட்டு உங்களுடைய கணக்கை கைப்பற்றலாம்.",
-"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." => "உங்களுடைய தரவு அடைவு மற்றும் உங்களுடைய கோப்புக்களை பெரும்பாலும் இணையத்தினூடாக அணுகலாம். ownCloud இனால் வழங்கப்படுகின்ற .htaccess கோப்பு வேலை செய்யவில்லை. தரவு அடைவை நீண்ட நேரத்திற்கு அணுகக்கூடியதாக உங்களுடைய வலைய சேவையகத்தை தகவமைக்குமாறு நாங்கள் உறுதியாக கூறுகிறோம் அல்லது தரவு அடைவை வலைய சேவையக மூல ஆவணத்திலிருந்து வெளியே அகற்றுக.  ",
 "Create an <strong>admin account</strong>" => "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக",
 "Advanced" => "மேம்பட்ட",
 "Data folder" => "தரவு கோப்புறை",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index ffab0bb9564..e5295cee103 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "ผู้ใช้งาน %s ได้แชร์โฟลเดอร์ \"%s\" ให้กับคุณ และคุณสามารถดาวน์โหลดโฟลเดอร์ดังกล่าวได้จากที่นี่: %s",
 "Category type not provided." => "ยังไม่ได้ระบุชนิดของหมวดหมู่",
 "No category to add?" => "ไม่มีหมวดหมู่ที่ต้องการเพิ่ม?",
-"This category already exists: " => "หมวดหมู่นี้มีอยู่แล้ว: ",
 "Object type not provided." => "ชนิดของวัตถุยังไม่ได้ถูกระบุ",
 "%s ID not provided." => "ยังไม่ได้ระบุรหัส %s",
 "Error adding %s to favorites." => "เกิดข้อผิดพลาดในการเพิ่ม %s เข้าไปยังรายการโปรด",
@@ -109,7 +108,6 @@
 "Security Warning" => "คำเตือนเกี่ยวกับความปลอดภัย",
 "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." => "หากปราศจากตัวสร้างหมายเลขแบบสุ่มที่ช่วยป้องกันความปลอดภัย ผู้บุกรุกอาจสามารถที่จะคาดคะเนรหัสยืนยันการเข้าถึงเพื่อรีเซ็ตรหัสผ่าน และเอาบัญชีของคุณไปเป็นของตนเองได้",
-"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." => "ไดเร็กทอรี่ข้อมูลและไฟล์ของคุณสามารถเข้าถึงได้จากอินเทอร์เน็ต ไฟล์ .htaccess ที่ ownCloud มีให้ไม่สามารถทำงานได้อย่างเหมาะสม เราขอแนะนำให้คุณกำหนดค่าเว็บเซิร์ฟเวอร์ใหม่ในรูปแบบที่ไดเร็กทอรี่เก็บข้อมูลไม่สามารถเข้าถึงได้อีกต่อไป หรือคุณได้ย้ายไดเร็กทอรี่ที่ใช้เก็บข้อมูลไปอยู่ภายนอกตำแหน่ง root ของเว็บเซิร์ฟเวอร์แล้ว",
 "Create an <strong>admin account</strong>" => "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>",
 "Advanced" => "ขั้นสูง",
 "Data folder" => "โฟลเดอร์เก็บข้อมูล",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 624887674d1..201b511647c 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s kullanıcısı \"%s\" dizinini sizinle paylaştı. %s adresinden indirilebilir",
 "Category type not provided." => "Kategori türü desteklenmemektedir.",
 "No category to add?" => "Eklenecek kategori yok?",
-"This category already exists: " => "Bu kategori zaten mevcut: ",
 "Object type not provided." => "Nesne türü desteklenmemektedir.",
 "%s ID not provided." => "%s ID belirtilmedi.",
 "Error adding %s to favorites." => "%s favorilere eklenirken hata oluştu",
@@ -106,7 +105,6 @@
 "Security Warning" => "Güvenlik Uyarisi",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Güvenli rasgele sayı üreticisi bulunamadı. Lütfen PHP OpenSSL eklentisini etkinleştirin.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Güvenli rasgele sayı üreticisi olmadan saldırganlar parola sıfırlama simgelerini tahmin edip hesabınızı ele geçirebilir.",
-"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." => "data dizininiz ve dosyalarınız büyük ihtimalle internet üzerinden erişilebilir. Owncloud tarafından sağlanan .htaccess  dosyası çalışmıyor. Web sunucunuzu yapılandırarak data dizinine erişimi kapatmanızı veya data dizinini web sunucu döküman dizini dışına almanızı şiddetle tavsiye ederiz.",
 "Create an <strong>admin account</strong>" => "Bir <strong>yönetici hesabı</strong> oluşturun",
 "Advanced" => "Gelişmiş",
 "Data folder" => "Veri klasörü",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index fa8150e7c9d..7eab365a39d 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Користувач %s поділився текою \"%s\" з вами. Він доступний для завантаження звідси: %s",
 "Category type not provided." => "Не вказано тип категорії.",
 "No category to add?" => "Відсутні категорії для додавання?",
-"This category already exists: " => "Ця категорія вже існує: ",
 "Object type not provided." => "Не вказано тип об'єкту.",
 "%s ID not provided." => "%s ID не вказано.",
 "Error adding %s to favorites." => "Помилка при додаванні %s до обраного.",
@@ -54,6 +53,7 @@
 "The app name is not specified." => "Не визначено ім'я програми.",
 "The required file {file} is not installed!" => "Необхідний файл {file} не встановлено!",
 "Share" => "Поділитися",
+"Shared" => "Опубліковано",
 "Error while sharing" => "Помилка під час публікації",
 "Error while unsharing" => "Помилка під час відміни публікації",
 "Error while changing permissions" => "Помилка при зміні повноважень",
@@ -83,6 +83,8 @@
 "Error setting expiration date" => "Помилка при встановленні терміна дії",
 "Sending ..." => "Надсилання...",
 "Email sent" => "Ел. пошта надіслана",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Оновлення виконалось неуспішно. Будь ласка, повідомте про цю проблему в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">спільноті ownCloud</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Оновлення виконалось успішно. Перенаправляємо вас на  ownCloud.",
 "ownCloud password reset" => "скидання пароля ownCloud",
 "Use the following link to reset your password: {link}" => "Використовуйте наступне посилання для скидання пароля: {link}",
 "You will receive a link to reset your password via Email." => "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту.",
@@ -106,7 +108,6 @@
 "Security Warning" => "Попередження про небезпеку",
 "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." => "Без безпечного генератора випадкових чисел зловмисник може визначити токени скидання пароля і заволодіти Вашим обліковим записом.",
-"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." => "Ваш каталог з даними та Ваші файли можливо доступні з Інтернету. Файл .htaccess, наданий з ownCloud, не працює. Ми наполегливо рекомендуємо Вам налаштувати свій веб-сервер таким чином, щоб каталог data більше не був доступний, або перемістити каталог data за межі кореневого каталогу документів веб-сервера.",
 "Create an <strong>admin account</strong>" => "Створити <strong>обліковий запис адміністратора</strong>",
 "Advanced" => "Додатково",
 "Data folder" => "Каталог даних",
@@ -126,6 +127,7 @@
 "Lost your password?" => "Забули пароль?",
 "remember" => "запам'ятати",
 "Log in" => "Вхід",
+"Alternative Logins" => "Альтернативні Логіни",
 "prev" => "попередній",
 "next" => "наступний",
 "Updating ownCloud to version %s, this may take a while." => "Оновлення ownCloud до версії %s, це може зайняти деякий час."
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 078cfa8dd8c..ca6f9b91da2 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Người dùng %s chia sẻ thư mục \"%s\" cho bạn .Bạn có thể tải tại đây : %s",
 "Category type not provided." => "Kiểu hạng mục không được cung cấp.",
 "No category to add?" => "Không có danh mục được thêm?",
-"This category already exists: " => "Danh mục này đã được tạo :",
 "Object type not provided." => "Loại đối tượng không được cung cấp.",
 "%s ID not provided." => "%s ID không được cung cấp.",
 "Error adding %s to favorites." => "Lỗi thêm %s vào mục yêu thích.",
@@ -106,7 +105,6 @@
 "Security Warning" => "Cảnh bảo bảo mật",
 "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 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." => "Thư mục dữ liệu và những tập tin của bạn có thể dễ dàng bị truy cập từ mạng. Tập tin .htaccess do ownCloud cung cấp không hoạt động. Chúng tôi đề nghị bạn nên cấu hình lại máy chủ web để thư mục dữ liệu không còn bị truy cập hoặc bạn nên di chuyển thư mục dữ liệu ra bên ngoài thư mục gốc của máy chủ.",
 "Create an <strong>admin account</strong>" => "Tạo một <strong>tài khoản quản trị</strong>",
 "Advanced" => "Nâng cao",
 "Data folder" => "Thư mục dữ liệu",
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index 9617d7260dc..57f0e96378c 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "No category to add?" => "没有分类添加了?",
-"This category already exists: " => "这个分类已经存在了:",
 "No categories selected for deletion." => "没有选者要删除的分类.",
 "Sunday" => "星期天",
 "Monday" => "星期一",
@@ -87,7 +86,6 @@
 "Security Warning" => "安全警告",
 "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." => "没有安全随机码生成器，黑客可以预测密码重置令牌并接管你的账户。",
-"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." => "您的数据文件夹和您的文件或许能够从互联网访问。ownCloud 提供的 .htaccesss 文件未其作用。我们强烈建议您配置网络服务器以使数据文件夹不能从互联网访问，或将移动数据文件夹移出网络服务器文档根目录。",
 "Create an <strong>admin account</strong>" => "建立一个 <strong>管理帐户</strong>",
 "Advanced" => "进阶",
 "Data folder" => "数据存放文件夹",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index f18fd6b357d..086687c08c3 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "用户 %s 与您共享了文件夹\"%s\"。文件夹下载地址：%s",
 "Category type not provided." => "未提供分类类型。",
 "No category to add?" => "没有可添加分类？",
-"This category already exists: " => "此分类已存在: ",
 "Object type not provided." => "未提供对象类型。",
 "%s ID not provided." => "%s ID未提供。",
 "Error adding %s to favorites." => "向收藏夹中新增%s时出错。",
@@ -107,7 +106,6 @@
 "Security Warning" => "安全警告",
 "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." => "没有安全随机码生成器，攻击者可能会猜测密码重置信息从而窃取您的账户",
-"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." => "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器根目录以外。",
 "Create an <strong>admin account</strong>" => "创建<strong>管理员账号</strong>",
 "Advanced" => "高级",
 "Data folder" => "数据目录",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 35183194d2a..58d2aca4095 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -5,7 +5,6 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "用戶 %s 與您分享了資料夾 \"%s\" ，您可以從這裡下載它： %s",
 "Category type not provided." => "未提供分類類型。",
 "No category to add?" => "沒有可增加的分類？",
-"This category already exists: " => "此分類已經存在：",
 "Object type not provided." => "不支援的物件類型",
 "%s ID not provided." => "未提供 %s ID 。",
 "Error adding %s to favorites." => "加入 %s 到最愛時發生錯誤。",
@@ -109,7 +108,6 @@
 "Security Warning" => "安全性警告",
 "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." => "若沒有安全的亂數產生器，攻擊者可能可以預測密碼重設信物，然後控制您的帳戶。",
-"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." => "您的資料目錄 (Data Directory) 和檔案可能可以由網際網路上面公開存取。Owncloud 所提供的 .htaccess 設定檔並未生效，我們強烈建議您設定您的網頁伺服器以防止資料目錄被公開存取，或將您的資料目錄移出網頁伺服器的 document root 。",
 "Create an <strong>admin account</strong>" => "建立一個<strong>管理者帳號</strong>",
 "Advanced" => "進階",
 "Data folder" => "資料夾",
diff --git a/core/routes.php b/core/routes.php
index 7408858b107..2527816b662 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -6,6 +6,10 @@
  * See the COPYING-README file.
  */
 
+// Post installation check
+$this->create('post_setup_check', '/post-setup-check')
+	->action('OC_Setup', 'postSetupCheck');
+
 // Core ajax actions
 // Search
 $this->create('search_ajax_search', '/search/ajax/search.php')
diff --git a/core/setup.php b/core/setup.php
index 66b8cf378bd..f16385466cb 100644
--- a/core/setup.php
+++ b/core/setup.php
@@ -43,7 +43,7 @@ if(isset($_POST['install']) AND $_POST['install']=='true') {
 		OC_Template::printGuestPage("", "installation", $options);
 	}
 	else {
-		header("Location: ".OC::$WEBROOT.'/');
+		header( 'Location: '.OC_Helper::linkToRoute( 'post_setup_check' ));
 		exit();
 	}
 }
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 03c580c9b0b..ad0d9cfbada 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -21,15 +21,15 @@
 	<?php if(!$_['secureRNG']): ?>
 	<fieldset class="warning">
 		<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
-		<span><?php echo $l->t('No secure random number generator is available, please enable the PHP OpenSSL extension.');?></span>		
-		<br/>
-		<span><?php echo $l->t('Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account.');?></span>		
+		<p><?php echo $l->t('No secure random number generator is available, please enable the PHP OpenSSL extension.');?><br/>
+		<?php echo $l->t('Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account.');?></p>		
 	</fieldset>
 	<?php endif; ?>
 	<?php if(!$_['htaccessWorking']): ?>
 	<fieldset class="warning">
 		<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
-		<span><?php echo $l->t('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.');?></span>		
+		<p><?php echo $l->t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.');?><br>
+		<?php echo $l->t('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>.');?></p>
 	</fieldset>
 	<?php endif; ?>
 	<fieldset id="adminaccount">
@@ -40,9 +40,11 @@
 			<img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt="" />
 		</p>
 		<p class="infield groupbottom">
-			<input type="password" name="adminpass" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" required />
+			<input type="password" name="adminpass" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" required data-typetoggle="#show" />
 			<label for="adminpass" class="infield"><?php echo $l->t( 'Password' ); ?></label>
-			<img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt="" />
+			<img class="svg" id="adminpass-icon" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt="" />
+			<input type="checkbox" id="show" name="show" />
+			<label for="show"></label>
 		</p>
 	</fieldset>
 
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 47fb75612cf..2049bcb36da 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -7,7 +7,6 @@
 		<?php foreach ($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
-		<script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('js_config');?>"></script>
 		<?php foreach ($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
 		<?php endforeach; ?>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 9aabc08acec..69330aa9fce 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -8,7 +8,6 @@
 		<?php foreach($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
-		<script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('js_config');?>"></script>
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
 		<?php endforeach; ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 2547278547f..c8b580b5fd9 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -1,14 +1,13 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<title><?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo OC_User::getDisplayName()?' ('.OC_Util::sanitizeHTML(OC_User::getDisplayName()).') ':'' ?></title>
+		<title><?php echo !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo !empty($_['user_displayname'])?' ('.$_['user_displayname'].') ':'' ?></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta name="apple-itunes-app" content="app-id=543672169">
 		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
 		<?php foreach($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
-		<script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('js_config');?>"></script>
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
 		<?php endforeach; ?>
diff --git a/core/templates/login.php b/core/templates/login.php
index ed9aaba8a4c..3be2b039b03 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -33,7 +33,7 @@
 			<input type="password" name="password" id="password" value="" data-typetoggle="#show"
 				   required<?php echo $_['user_autofocus'] ? '' : ' autofocus'; ?> />
 			<label for="password" class="infield"><?php echo $l->t('Password'); ?></label>
-			<img class="svg" id="pass_image" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt=""/>
+			<img class="svg" id="password-icon" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt=""/>
 			<input type="checkbox" id="show" name="show" />
 			<label for="show"></label>
 		</p>
@@ -48,9 +48,9 @@
 	<fieldset>
 		<legend><?php echo $l->t('Alternative Logins') ?></legend>
 		<ul>
-			<? foreach($_['alt_login'] as $login): ?>
+			<?php foreach($_['alt_login'] as $login): ?>
 				<li><a class="button" href="<?php echo $login['href']; ?>" ><?php echo $login['name']; ?></a></li>
-				<?php endforeach; ?>
+			<?php endforeach; ?>
 		</ul>
 	</fieldset>
 </form>
diff --git a/db_structure.xml b/db_structure.xml
index f4111bfabd0..fc7f1082ffa 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -96,6 +96,50 @@
 
 	<table>
 
+		<name>*dbprefix*file_map</name>
+
+		<declaration>
+
+			<field>
+				<name>logic_path</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>512</length>
+			</field>
+
+			<field>
+				<name>physic_path</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>512</length>
+			</field>
+
+			<index>
+				<name>file_map_lp_index</name>
+				<unique>true</unique>
+				<field>
+					<name>logic_path</name>
+					<sorting>ascending</sorting>
+				</field>
+			</index>
+
+			<index>
+				<name>file_map_pp_index</name>
+				<unique>true</unique>
+				<field>
+					<name>physic_path</name>
+					<sorting>ascending</sorting>
+				</field>
+			</index>
+
+		</declaration>
+
+	</table>
+
+	<table>
+
 		<name>*dbprefix*mimetypes</name>
 
 		<declaration>
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index cee3db1d1b3..b0c9bf67feb 100644
--- a/l10n/af_ZA/core.po
+++ b/l10n/af_ZA/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-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 17:00+0000\n"
-"Last-Translator: Jano Barnard <translate@janobarnard.co.za>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,7 +51,8 @@ msgid "No category to add?"
 msgstr ""
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
+#, php-format
+msgid "This category already exists: %s"
 msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
@@ -156,59 +157,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Instellings"
 
-#: js/js.js:760
+#: js/js.js:764
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:761
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:762
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:763
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:765
+#: js/js.js:769
 msgid "today"
 msgstr ""
 
-#: js/js.js:766
+#: js/js.js:770
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:772
 msgid "last month"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:774
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:775
 msgid "last year"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:776
 msgid "years ago"
 msgstr ""
 
@@ -467,7 +468,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr ""
 
@@ -477,71 +478,75 @@ msgid ""
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr ""
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Skep `n <strong>admin-rekening</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Gevorderd"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Stel databasis op"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "sal gebruik word"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Databasis-gebruiker"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Databasis-wagwoord"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Databasis naam"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Maak opstelling klaar"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "webdienste onder jou beheer"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Teken uit"
 
@@ -571,6 +576,10 @@ msgstr "onthou"
 msgid "Log in"
 msgstr "Teken aan"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "vorige"
diff --git a/l10n/af_ZA/files.po b/l10n/af_ZA/files.po
index 3814f1cfa0c..43e9f26707c 100644
--- a/l10n/af_ZA/files.po
+++ b/l10n/af_ZA/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-02-01 00:17+0100\n"
-"PO-Revision-Date: 2011-08-13 02:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,46 +17,60 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -68,11 +82,15 @@ msgstr ""
 msgid "Unshare"
 msgstr ""
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr ""
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr ""
 
@@ -177,31 +195,31 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/af_ZA/files_trashbin.po b/l10n/af_ZA/files_trashbin.po
index ca4278cffc8..6fd4dfb314f 100644
--- a/l10n/af_ZA/files_trashbin.po
+++ b/l10n/af_ZA/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/af_ZA/files_versions.po b/l10n/af_ZA/files_versions.po
index 6cb41d2c080..14eaae14745 100644
--- a/l10n/af_ZA/files_versions.po
+++ b/l10n/af_ZA/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-02-01 00:17+0100\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,10 +17,45 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po
index f621a8914be..a768c32d6cd 100644
--- a/l10n/af_ZA/settings.po
+++ b/l10n/af_ZA/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-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 17:00+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -21,6 +21,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr ""
@@ -45,10 +54,6 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr ""
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr ""
@@ -111,7 +116,7 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr ""
 
@@ -188,67 +193,83 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Wagwoord"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Nuwe wagwoord"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr ""
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -282,10 +303,6 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po
index dd30840b779..e8faea36b86 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-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 16:31+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -213,7 +213,7 @@ msgid "Use TLS"
 msgstr ""
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
 #: templates/settings.php:39
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 100a7f42a6e..f3cdb9f639c 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -52,8 +52,9 @@ msgid "No category to add?"
 msgstr "ألا توجد فئة للإضافة؟"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "هذه الفئة موجودة مسبقاً"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -157,59 +158,59 @@ msgstr "تشرين الثاني"
 msgid "December"
 msgstr "كانون الاول"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "تعديلات"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "منذ ثواني"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "منذ دقيقة"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} منذ دقائق"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "اليوم"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr ""
 
@@ -468,7 +469,7 @@ msgstr "عدل الفئات"
 msgid "Add"
 msgstr "أدخل"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "تحذير أمان"
 
@@ -478,71 +479,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "لا يوجد مولّد أرقام عشوائية ، الرجاء تفعيل الـ PHP OpenSSL extension."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr ""
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "أضف </strong>مستخدم رئيسي <strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "خيارات متقدمة"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "مجلد المعلومات"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "أسس قاعدة البيانات"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "سيتم استخدمه"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "مستخدم قاعدة البيانات"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "كلمة سر مستخدم قاعدة البيانات"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "إسم قاعدة البيانات"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "مساحة جدول قاعدة البيانات"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "خادم قاعدة البيانات"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "انهاء التعديلات"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "خدمات الوب تحت تصرفك"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "الخروج"
 
@@ -564,14 +569,18 @@ msgstr "الرجاء إعادة تعيين كلمة السر لتأمين حسا
 msgid "Lost your password?"
 msgstr "هل نسيت كلمة السر؟"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "تذكر"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "أدخل"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "السابق"
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index eefbee4f65e..ce179ab2fb8 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.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-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -18,46 +18,60 @@ 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/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "تم ترفيع الملفات بنجاح."
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "حجم الملف الذي تريد ترفيعه أعلى مما MAX_FILE_SIZE يسمح به في واجهة ال HTML."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "تم ترفيع جزء من الملفات الذي تريد ترفيعها فقط"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "لم يتم ترفيع أي من الملفات"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "المجلد المؤقت غير موجود"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -69,11 +83,15 @@ msgstr "الملفات"
 msgid "Unshare"
 msgstr "إلغاء مشاركة"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "محذوف"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr ""
 
@@ -178,31 +196,31 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "الاسم"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "حجم"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "معدل"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/ar/files_trashbin.po b/l10n/ar/files_trashbin.po
index d892fd2a983..70c6ea95dde 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ 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"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "اسم"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/ar/files_versions.po b/l10n/ar/files_versions.po
index 8224c627626..b915753cedc 100644
--- a/l10n/ar/files_versions.po
+++ b/l10n/ar/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,10 +18,45 @@ 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/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "السجل الزمني"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "أصدرة الملفات"
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index c3a33123458..e3785a9b5a7 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -24,6 +24,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "فشل تحميل القائمة من الآب ستور"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "لم يتم التأكد من الشخصية بنجاح"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "المجموعة موجودة مسبقاً"
@@ -48,10 +57,6 @@ msgstr "البريد الإلكتروني غير صالح"
 msgid "Unable to delete group"
 msgstr "فشل إزالة المجموعة"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "لم يتم التأكد من الشخصية بنجاح"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "فشل إزالة المستخدم"
@@ -114,7 +119,7 @@ msgstr "خطأ"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "حفظ"
 
@@ -191,67 +196,83 @@ msgstr "تحميل عميل آندرويد"
 msgid "Download iOS Client"
 msgstr "تحميل عميل آي أو أس"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "كلمات السر"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "لقد تم تغيير كلمة السر"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "لم يتم تعديل كلمة السر بنجاح"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "كلمات السر الحالية"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "كلمات سر جديدة"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "أظهر"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "عدل كلمة السر"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "العنوان البريدي"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "عنوانك البريدي"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "أدخل عنوانك البريدي لتفعيل استرجاع كلمة المرور"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "اللغة"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "ساعد في الترجمه"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "إستخدم هذا العنوان للإتصال بـ ownCloud في مدير الملفات"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "إصدار"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -285,10 +306,6 @@ msgstr ""
 msgid "Other"
 msgstr "شيء آخر"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "مدير المجموعة"
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index d723f7f7d7d..059e10baefd 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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -213,7 +213,7 @@ msgid "Use TLS"
 msgstr ""
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
 #: templates/settings.php:39
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 692a844f771..aaa4f3d190d 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -54,7 +54,8 @@ msgid "No category to add?"
 msgstr ""
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
+#, php-format
+msgid "This category already exists: %s"
 msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
@@ -159,59 +160,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "преди секунди"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "преди 1 минута"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "преди 1 час"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "днес"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "последният месец"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "последната година"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "последните години"
 
@@ -470,7 +471,7 @@ msgstr ""
 msgid "Add"
 msgstr "Добавяне"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr ""
 
@@ -480,71 +481,75 @@ msgid ""
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr ""
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "уеб услуги под Ваш контрол"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr ""
 
@@ -566,14 +571,18 @@ msgstr ""
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr ""
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr ""
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index b1a38c33dba..f4b6a8ca674 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.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-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -19,46 +19,60 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Липсва временна папка"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -70,11 +84,15 @@ msgstr "Файлове"
 msgid "Unshare"
 msgstr ""
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Изтриване"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Преименуване"
 
@@ -179,31 +197,31 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Променено"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/bg_BG/files_trashbin.po b/l10n/bg_BG/files_trashbin.po
index 61fe9f67efc..cf5275530e1 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Име"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/bg_BG/files_versions.po b/l10n/bg_BG/files_versions.po
index be466434b93..c79f0e63842 100644
--- a/l10n/bg_BG/files_versions.po
+++ b/l10n/bg_BG/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "История"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index f056463c578..4cef09976a2 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -24,6 +24,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Възникна проблем с идентификацията"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr ""
@@ -48,10 +57,6 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Възникна проблем с идентификацията"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr ""
@@ -114,7 +119,7 @@ msgstr "Грешка"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr ""
 
@@ -191,67 +196,83 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Парола"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr ""
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -285,10 +306,6 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 932ba233880..fd4876ac72a 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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -213,7 +213,7 @@ msgid "Use TLS"
 msgstr ""
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
 #: templates/settings.php:39
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 00bc3030b2f..6b0d2ba2698 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 13:58+0000\n"
-"Last-Translator: Shubhra Paul <paul_shubhra@yahoo.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,8 +52,9 @@ msgid "No category to add?"
 msgstr "যোগ করার মত কোন ক্যাটেগরি নেই ?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "এই ক্যাটেগরিটি পূর্ব থেকেই বিদ্যমানঃ"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -157,59 +158,59 @@ msgstr "নভেম্বর"
 msgid "December"
 msgstr "ডিসেম্বর"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "নিয়ামকসমূহ"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "সেকেন্ড পূর্বে"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 মিনিট পূর্বে"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} মিনিট পূর্বে"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "1 ঘন্টা পূর্বে"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{hours} ঘন্টা পূর্বে"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "আজ"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "গতকাল"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} দিন পূর্বে"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "গতমাস"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{months} মাস পূর্বে"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "মাস পূর্বে"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "গত বছর"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "বছর পূর্বে"
 
@@ -468,7 +469,7 @@ msgstr "ক্যাটেগরি সম্পাদনা"
 msgid "Add"
 msgstr "যোগ কর"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "নিরাপত্তাজনিত সতর্কতা"
 
@@ -478,71 +479,75 @@ msgid ""
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr ""
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>প্রশাসক একাউন্ট</strong> তৈরী করুন"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "সুচারু"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "ডাটা ফোল্ডার "
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "ডাটাবেচ কনফিগার করুন"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "ব্যবহৃত হবে"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "ডাটাবেজ ব্যবহারকারী"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "ডাটাবেজ কূটশব্দ"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "ডাটাবেজের নাম"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "ডাটাবেজ টেবলস্পেস"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "ডাটাবেজ হোস্ট"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "সেটআপ সুসম্পন্ন কর"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "ওয়েব সার্ভিসের নিয়ন্ত্রণ আপনার হাতের মুঠোয়"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "প্রস্থান"
 
@@ -564,14 +569,18 @@ msgstr ""
 msgid "Lost your password?"
 msgstr "কূটশব্দ হারিয়েছেন?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "মনে রাখ"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "প্রবেশ"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "পূর্ববর্তী"
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index 8192e6fedfc..023ecf7d1e7 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.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-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -18,46 +18,60 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "কোন ফাইল আপলোড করা হয় নি। সমস্যা অজ্ঞাত।"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "কোন সমস্যা নেই, ফাইল আপলোড সুসম্পন্ন হয়েছে"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "আপলোড করা  ফাইলটি php.ini তে বর্ণিত  upload_max_filesize নির্দেশিত আয়তন অতিক্রম করছেঃ"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "আপলোড করা ফাইলটি HTML  ফর্মে নির্ধারিত  MAX_FILE_SIZE নির্দেশিত সর্বোচ্চ আকার অতিক্রম করেছে "
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "আপলোড করা ফাইলটি আংশিক আপলোড করা হয়েছে"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "কোন ফাইল আপলোড করা হয় নি"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "অস্থায়ী ফোল্ডার খোয়া গিয়েছে"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "ডিস্কে লিখতে ব্যর্থ"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "যথেষ্ঠ পরিমাণ স্থান নেই"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "ভুল ডিরেক্টরি"
 
@@ -69,11 +83,15 @@ msgstr "ফাইল"
 msgid "Unshare"
 msgstr "ভাগাভাগি বাতিল "
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "মুছে ফেল"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "পূনঃনামকরণ"
 
@@ -178,31 +196,31 @@ msgstr "URL ফাঁকা রাখা যাবে না।"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ফোল্ডারের নামটি সঠিক নয়। 'ভাগাভাগি করা' শুধুমাত্র Owncloud  এর জন্য সংরক্ষিত।"
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "নাম"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "আকার"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "পরিবর্তিত"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "১টি ফোল্ডার"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} টি ফোল্ডার"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "১টি ফাইল"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} টি ফাইল"
 
diff --git a/l10n/bn_BD/files_trashbin.po b/l10n/bn_BD/files_trashbin.po
index 8cb4d9688e8..ff75311f2f1 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "রাম"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "১টি ফোল্ডার"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} টি ফোল্ডার"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "১টি ফাইল"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} টি ফাইল"
 
diff --git a/l10n/bn_BD/files_versions.po b/l10n/bn_BD/files_versions.po
index 2af1e4efdd9..3c072f78160 100644
--- a/l10n/bn_BD/files_versions.po
+++ b/l10n/bn_BD/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,10 +17,45 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "ইতিহাস"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "ফাইল ভার্সন করা"
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index e5911603308..946bd8cd254 100644
--- a/l10n/bn_BD/settings.po
+++ b/l10n/bn_BD/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -22,6 +22,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "অ্যাপস্টোর থেকে তালিকা লোড করতে সক্ষম নয়"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "অনুমোদন ঘটিত সমস্যা"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "গোষ্ঠীটি পূর্ব থেকেই বিদ্যমান"
@@ -46,10 +55,6 @@ msgstr "ই-মেইলটি সঠিক নয়"
 msgid "Unable to delete group"
 msgstr "গোষ্ঠী মুছে ফেলা সম্ভব হলো না "
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "অনুমোদন ঘটিত সমস্যা"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "ব্যবহারকারী মুছে ফেলা সম্ভব হলো না "
@@ -112,7 +117,7 @@ msgstr "সমস্যা"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "সংরক্ষণ করা হচ্ছে.."
 
@@ -189,67 +194,83 @@ msgstr "অ্যান্ড্রয়েড ক্লায়েন্ট ডা�
 msgid "Download iOS Client"
 msgstr "iOS ক্লায়েন্ট ডাউনলোড করুন"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "কূটশব্দ"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "আপনার কূটশব্দটি পরিবর্তন করা হয়েছে "
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "আপনার কূটশব্দটি পরিবর্তন করতে সক্ষম নয়"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "বর্তমান কূটশব্দ"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "নতুন কূটশব্দ"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "প্রদর্শন"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "কূটশব্দ পরিবর্তন করুন"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "ই-মেইল "
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "আপনার ই-মেইল ঠিকানা"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "কূটশব্দ পূনরূদ্ধার সক্রিয় করার জন্য ই-মেইল ঠিকানাটি পূরণ করুন"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "ভাষা"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "অনুবাদ করতে সহায়তা করুন"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "আপনার ownCloud এ সংযুক্ত হতে এই ঠিকানাটি আপনার ফাইল ব্যবস্থাপকে ব্যবহার করুন"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "ভার্সন"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -283,10 +304,6 @@ msgstr "অসীম"
 msgid "Other"
 msgstr "অন্যান্য"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "গোষ্ঠী প্রশাসক"
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index 2f79910e815..b39dcc30cbc 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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -213,8 +213,8 @@ msgid "Use TLS"
 msgstr "TLS ব্যবহার কর"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "SSL সংযোগের জন্য এটি ব্যবহার করবেন না, তাহলে ব্যর্থ হবেনই।"
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 4c045d1fe1e..10f01f6ce35 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,8 +53,9 @@ msgid "No category to add?"
 msgstr "No voleu afegir cap categoria?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Aquesta categoria ja existeix:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr "Aquesta categoria ja existeix: %s"
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -158,59 +159,59 @@ msgstr "Novembre"
 msgid "December"
 msgstr "Desembre"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Arranjament"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "segons enrere"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "fa 1 minut"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "fa {minutes} minuts"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "fa 1 hora"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "fa {hours} hores"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "avui"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "ahir"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "fa {days} dies"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "el mes passat"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "fa {months} mesos"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "mesos enrere"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "l'any passat"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "anys enrere"
 
@@ -469,7 +470,7 @@ msgstr "Edita les categories"
 msgid "Add"
 msgstr "Afegeix"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Avís de seguretat"
 
@@ -479,71 +480,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "No està disponible el generador de nombres aleatoris segurs, habiliteu l'extensió de PHP OpenSSL."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Sense un generador de nombres aleatoris segurs un atacant podria predir els senyals per restablir la contrasenya i prendre-us el compte."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "La carpeta de dades i els fitxers provablement són accessibles des d'internet. El fitxer .htaccess que proporciona ownCloud no funciona. Us recomanem que configureu el vostre servidor web de manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de la carpeta arrel del servidor web."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>compte d'administrador</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Avançat"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Carpeta de dades"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Configura la base de dades"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "s'usarà"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Usuari de la base de dades"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Contrasenya de la base de dades"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Nom de la base de dades"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Espai de taula de la base de dades"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Ordinador central de la base de dades"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Acaba la configuració"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "controleu els vostres serveis web"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Surt"
 
@@ -565,14 +570,18 @@ msgstr "Canvieu la contrasenya de nou per assegurar el vostre compte."
 msgid "Lost your password?"
 msgstr "Heu perdut la contrasenya?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "recorda'm"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Inici de sessió"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr "Acreditacions alternatives"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "anterior"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 758bde167ae..eb952e6f7c2 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 08:40+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,46 +24,60 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "No s'ha carregat cap fitxer. Error desconegut"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "El fitxer s'ha pujat correctament"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "L’arxiu que voleu carregar supera el màxim definit en la directiva upload_max_filesize del php.ini:"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El fitxer de pujada excedeix la directiva MAX_FILE_SIZE especificada al formulari HTML"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "El fitxer només s'ha pujat parcialment"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "El fitxer no s'ha pujat"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "S'ha perdut un fitxer temporal"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Ha fallat en escriure al disc"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "No hi ha prou espai disponible"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Directori no vàlid."
 
@@ -75,11 +89,15 @@ msgstr "Fitxers"
 msgid "Unshare"
 msgstr "Deixa de compartir"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr "Esborra permanentment"
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Reanomena"
 
@@ -184,31 +202,31 @@ msgstr "La URL no pot ser buida"
 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:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Mida"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} carpetes"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 fitxer"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} fitxers"
 
diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po
index c5cc2dc2b4a..481b00ceee9 100644
--- a/l10n/ca/files_encryption.po
+++ b/l10n/ca/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 07:20+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\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"
@@ -47,15 +47,15 @@ msgstr "Encriptatge"
 
 #: templates/settings-personal.php:7
 msgid "File encryption is enabled."
-msgstr ""
+msgstr "L'encriptació de fitxers està activada."
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "Els tipus de fitxers següents no s'encriptaran:"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "Exclou els tipus de fitxers següents de l'encriptatge:"
 
 #: templates/settings.php:12
 msgid "None"
diff --git a/l10n/ca/files_trashbin.po b/l10n/ca/files_trashbin.po
index 3bb530ebc63..4c5e094e6d5 100644
--- a/l10n/ca/files_trashbin.po
+++ b/l10n/ca/files_trashbin.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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 15:22+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\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"
@@ -18,31 +18,45 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr "No s'ha pogut esborrar permanentment %s"
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr "No s'ha pogut restaurar %s"
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr "executa l'operació de restauració"
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr "esborra el fitxer permanentment"
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Nom"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr "Eliminat"
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} carpetes"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 fitxer"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} fitxers"
 
diff --git a/l10n/ca/files_versions.po b/l10n/ca/files_versions.po
index 0db50601e4c..43021a3304d 100644
--- a/l10n/ca/files_versions.po
+++ b/l10n/ca/files_versions.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 #   <josep_tomas@hotmail.com>, 2012.
+#  <rcalvoi@yahoo.com>, 2013.
 #   <rcalvoi@yahoo.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 15:40+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\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"
@@ -19,10 +20,45 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr "No s'ha pogut revertir: %s"
+
+#: history.php:40
+msgid "success"
+msgstr "èxit"
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr "El fitxer %s s'ha revertit a la versió %s"
+
+#: history.php:49
+msgid "failure"
+msgstr "fallada"
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr "El fitxer %s no s'ha pogut revertir a la versió %s"
+
+#: history.php:68
+msgid "No old versions available"
+msgstr "No hi ha versións antigues disponibles"
+
+#: history.php:73
+msgid "No path specified"
+msgstr "No heu especificat el camí"
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Historial"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr "Reverteix un fitxer a una versió anterior fent clic en el seu botó de reverteix"
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Fitxers de Versions"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 4ad389d707e..3234dabdadf 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 16:48+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 15:20+0000\n"
 "Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -27,6 +27,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "No s'ha pogut carregar la llista des de l'App Store"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Error d'autenticació"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr "No s'ha pogut canviar el nom a mostrar"
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "El grup ja existeix"
@@ -51,10 +60,6 @@ msgstr "El correu electrònic no és vàlid"
 msgid "Unable to delete group"
 msgstr "No es pot eliminar el grup"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Error d'autenticació"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "No es pot eliminar l'usuari"
@@ -117,7 +122,7 @@ msgstr "Error"
 msgid "Updated"
 msgstr "Actualitzada"
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "S'està desant..."
 
@@ -194,67 +199,83 @@ msgstr " Baixa el client per Android"
 msgid "Download iOS Client"
 msgstr "Baixa el client per iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Contrasenya"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "La seva contrasenya s'ha canviat"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "No s'ha pogut canviar la contrasenya"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Contrasenya actual"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Contrasenya nova"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "mostra"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Canvia la contrasenya"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Nom a mostrar"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr "El vostre nom a mostrar ha canviat"
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr "No s'ha pogut canviar el vostre nom a mostrar"
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr "Canvia el nom a mostrar"
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Correu electrònic"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ompliu el correu electrònic per activar la recuperació de contrasenya"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Ajudeu-nos amb la traducció"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Useu aquesta adreça per connectar amb ownCloud des del gestor de fitxers"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Versió"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -288,10 +309,6 @@ msgstr "Il·limitat"
 msgid "Other"
 msgstr "Un altre"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr "Nom a mostrar"
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grup Admin"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 09de26a1cc2..98ca278100a 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.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-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 08:50+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 12:20+0000\n"
 "Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -215,8 +215,8 @@ msgid "Use TLS"
 msgstr "Usa TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "No ho useu en connexions SSL, fallarà."
+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:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 1f2c45b65f5..65f55a38758 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,8 +54,9 @@ msgid "No category to add?"
 msgstr "Žádná kategorie k přidání?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Tato kategorie již existuje: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr "Kategorie již existuje: %s"
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -159,59 +160,59 @@ msgstr "Listopad"
 msgid "December"
 msgstr "Prosinec"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Nastavení"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "před pár vteřinami"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "před minutou"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "před {minutes} minutami"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "před hodinou"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "před {hours} hodinami"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "včera"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "před {days} dny"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "minulý mesíc"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "před {months} měsíci"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "před měsíci"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "minulý rok"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "před lety"
 
@@ -470,7 +471,7 @@ msgstr "Upravit kategorie"
 msgid "Add"
 msgstr "Přidat"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Bezpečnostní upozornění"
 
@@ -480,71 +481,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Není dostupný žádný bezpečný generátor náhodných čísel. Povolte, prosím, rozšíření OpenSSL v PHP."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Bez bezpečného generátoru náhodných čísel může útočník předpovědět token pro obnovu hesla a převzít kontrolu nad Vaším účtem."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Váš adresář dat a všechny Vaše soubory jsou pravděpodobně přístupné z internetu. Soubor .htaccess, který je poskytován ownCloud, nefunguje. Důrazně Vám doporučujeme nastavit váš webový server tak, aby nebyl adresář dat přístupný, nebo přesunout adresář dat mimo kořenovou složku dokumentů webového serveru."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Vytvořit <strong>účet správce</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Složka s daty"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Nastavit databázi"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "bude použito"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Uživatel databáze"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Heslo databáze"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Název databáze"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Tabulkový prostor databáze"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Hostitel databáze"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Dokončit nastavení"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "webové služby pod Vaší kontrolou"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Odhlásit se"
 
@@ -566,14 +571,18 @@ msgstr "Změňte, prosím, své heslo pro opětovné zabezpečení Vašeho účt
 msgid "Lost your password?"
 msgstr "Ztratili jste své heslo?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "zapamatovat si"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Přihlásit"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr "Alternativní přihlášení"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "předchozí"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 36e541de84c..16812c71df7 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:40+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,46 +20,60 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Soubor nebyl odeslán. Neznámá chyba"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Soubor byl odeslán úspěšně"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Odesílaný soubor přesahuje velikost upload_max_filesize povolenou v php.ini:"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Odeslaný soubor přesáhl svou velikostí parametr MAX_FILE_SIZE specifikovaný v formuláři HTML"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Soubor byl odeslán pouze částečně"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Žádný soubor nebyl odeslán"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Chybí adresář pro dočasné soubory"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Zápis na disk selhal"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Nedostatek dostupného místa"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Neplatný adresář"
 
@@ -71,11 +85,15 @@ msgstr "Soubory"
 msgid "Unshare"
 msgstr "Zrušit sdílení"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr "Trvale odstranit"
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Smazat"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Přejmenovat"
 
@@ -180,31 +198,31 @@ msgstr "URL nemůže být prázdná"
 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:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Název"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Změněno"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 složka"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} složky"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 soubor"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} soubory"
 
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
index 2df7a8af809..ea06c00d305 100644
--- a/l10n/cs_CZ/files_encryption.po
+++ b/l10n/cs_CZ/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 09:51+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,15 +47,15 @@ msgstr "Šifrování"
 
 #: templates/settings-personal.php:7
 msgid "File encryption is enabled."
-msgstr ""
+msgstr "Šifrování je povoleno."
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "Následující typy souborů nebudou šifrovány:"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "Vyjmout následující typy souborů ze šifrování:"
 
 #: templates/settings.php:12
 msgid "None"
diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po
index 29c424b5de7..5055b347339 100644
--- a/l10n/cs_CZ/files_trashbin.po
+++ b/l10n/cs_CZ/files_trashbin.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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 06:40+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,31 +18,45 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr "Nelze trvale odstranit %s"
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr "Nelze obnovit %s"
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr "provést obnovu"
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr "trvale odstranit soubor"
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Název"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr "Smazáno"
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 složka"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} složky"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 soubor"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} soubory"
 
diff --git a/l10n/cs_CZ/files_versions.po b/l10n/cs_CZ/files_versions.po
index 3e62a18ee40..928ac501c8a 100644
--- a/l10n/cs_CZ/files_versions.po
+++ b/l10n/cs_CZ/files_versions.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # Martin  <fireball@atlas.cz>, 2012.
-# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 06:40+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,45 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr "Nelze navrátit: %s"
+
+#: history.php:40
+msgid "success"
+msgstr "úspěch"
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr "Soubor %s byl navrácen na verzi %s"
+
+#: history.php:49
+msgid "failure"
+msgstr "sehlhání"
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr "Soubor %s nemohl být navrácen na verzi %s"
+
+#: history.php:68
+msgid "No old versions available"
+msgstr "Nejsou dostupné žádné starší verze"
+
+#: history.php:73
+msgid "No path specified"
+msgstr "Nezadána cesta"
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Historie"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr "Navraťte soubor do předchozí verze kliknutím na tlačítko navrátit"
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Verzování souborů"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index c232c3b36df..edfcef8add0 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 08:10+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 12:41+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"
@@ -27,6 +27,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Nelze načíst seznam z App Store"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Chyba ověření"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr "Nelze změnit zobrazované jméno"
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Skupina již existuje"
@@ -51,10 +60,6 @@ msgstr "Neplatný e-mail"
 msgid "Unable to delete group"
 msgstr "Nelze smazat skupinu"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Chyba ověření"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Nelze smazat uživatele"
@@ -117,7 +122,7 @@ msgstr "Chyba"
 msgid "Updated"
 msgstr "Aktualizováno"
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Ukládám..."
 
@@ -194,67 +199,83 @@ msgstr "Stáhnout klienta pro android"
 msgid "Download iOS Client"
 msgstr "Stáhnout klienta pro iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Vaše heslo bylo změněno"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Vaše heslo nelze změnit"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Současné heslo"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Nové heslo"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "zobrazit"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Změnit heslo"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Zobrazované jméno"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr "Vaše zobrazované jméno bylo změněno"
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr "Nelze změnit vaše zobrazované jméno"
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr "Změnit zobrazované jméno"
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Vaše e-mailová adresa"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Pro povolení změny hesla vyplňte adresu e-mailu"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Jazyk"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Pomoci s překladem"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Použijte tuto adresu pro připojení k vašemu ownCloud skrze správce souborů"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Verze"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -288,10 +309,6 @@ msgstr "Neomezeně"
 msgid "Other"
 msgstr "Jiná"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr "Zobrazované jméno"
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Správa skupiny"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 9ef32071e27..8e0892a688b 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.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-02-04 00:05+0100\n"
-"PO-Revision-Date: 2013-02-03 07:40+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 06:40+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"
@@ -215,8 +215,8 @@ msgid "Use TLS"
 msgstr "Použít TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Nepoužívejte pro připojení pomocí SSL, připojení selže."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr "Nepoužívejte pro spojení LDAP, selže."
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index d3a5c7d2f98..7ac480d339f 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -59,8 +59,9 @@ msgid "No category to add?"
 msgstr "Ingen kategori at tilføje?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Denne kategori eksisterer allerede: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -164,59 +165,59 @@ msgstr "November"
 msgid "December"
 msgstr "December"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 minut siden"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutter siden"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "1 time siden"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{hours} timer siden"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} dage siden"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "sidste måned"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{months} måneder siden"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "måneder siden"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "sidste år"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "år siden"
 
@@ -475,7 +476,7 @@ msgstr "Rediger kategorier"
 msgid "Add"
 msgstr "Tilføj"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Sikkerhedsadvarsel"
 
@@ -485,71 +486,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Ingen sikker tilfældighedsgenerator til tal er tilgængelig. Aktiver venligst OpenSSL udvidelsen."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Uden en sikker tilfældighedsgenerator til tal kan en angriber måske gætte dit gendan kodeord og overtage din konto"
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Din data mappe og dine filer er muligvis tilgængelige fra internettet. .htaccess filen som ownCloud leverer virker ikke. Vi anbefaler på det kraftigste at du konfigurerer din webserver på en måske så data mappen ikke  længere er tilgængelig eller at du flytter data mappen uden for webserverens dokument rod.  "
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Opret en <strong>administratorkonto</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Konfigurer databasen"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "vil blive brugt"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Databasebruger"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Databasekodeord"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Navn på database"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Database tabelplads"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Databasehost"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Afslut opsætning"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "Webtjenester under din kontrol"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Log ud"
 
@@ -571,14 +576,18 @@ msgstr "Skift adgangskode for at sikre din konto igen."
 msgid "Lost your password?"
 msgstr "Mistet dit kodeord?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "husk"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Log ind"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "forrige"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 2768aaf4490..faeb92854c3 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -25,46 +25,60 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen fil blev uploadet. Ukendt fejl."
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Der er ingen fejl, filen blev uploadet med success"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Den uploadede fil overskrider MAX_FILE_SIZE -direktivet som er specificeret i HTML-formularen"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Den uploadede file blev kun delvist uploadet"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Ingen fil blev uploadet"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Mangler en midlertidig mappe"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Fejl ved skrivning til disk."
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Ugyldig mappe."
 
@@ -76,11 +90,15 @@ msgstr "Filer"
 msgid "Unshare"
 msgstr "Fjern deling"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Slet"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Omdøb"
 
@@ -185,31 +203,31 @@ msgstr "URLen kan ikke være tom."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud"
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Ændret"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} filer"
 
diff --git a/l10n/da/files_trashbin.po b/l10n/da/files_trashbin.po
index 34a7ae71319..107b90ea909 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Navn"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} filer"
 
diff --git a/l10n/da/files_versions.po b/l10n/da/files_versions.po
index 847d3bda8aa..6ae8e6b45e6 100644
--- a/l10n/da/files_versions.po
+++ b/l10n/da/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -19,10 +19,45 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Historik"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Versionering af filer"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 297100e94e2..b2be1f63796 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -31,6 +31,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Kunne ikke indlæse listen fra App Store"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Adgangsfejl"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Gruppen findes allerede"
@@ -55,10 +64,6 @@ msgstr "Ugyldig email adresse"
 msgid "Unable to delete group"
 msgstr "Gruppen kan ikke slettes"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Adgangsfejl"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Bruger kan ikke slettes"
@@ -121,7 +126,7 @@ msgstr "Fejl"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Gemmer..."
 
@@ -198,67 +203,83 @@ msgstr "Hent Android Klient"
 msgid "Download iOS Client"
 msgstr "Hent iOS Klient"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Kodeord"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Din adgangskode blev ændret"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Ude af stand til at ændre dit kodeord"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Nuværende adgangskode"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Ny adgangskode"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "vis"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Skift kodeord"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Din emailadresse"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Indtast en emailadresse for at kunne få påmindelse om adgangskode"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Sprog"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Hjælp med oversættelsen"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Brug denne adresse til at oprette forbindelse til din ownCloud i din filstyring"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Version"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -292,10 +313,6 @@ msgstr "Ubegrænset"
 msgid "Other"
 msgstr "Andet"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Gruppe Administrator"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 63c885ecaa7..31ec98eaba9 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -218,8 +218,8 @@ msgid "Use TLS"
 msgstr "Brug TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Brug ikke til SSL forbindelser, da den vil fejle."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index b46bf407176..eb62f53acad 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 00:10+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -66,8 +66,9 @@ msgid "No category to add?"
 msgstr "Keine Kategorie hinzuzufügen?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Kategorie existiert bereits:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -171,59 +172,59 @@ msgstr "November"
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "vor einer Minute"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "Vor {minutes} Minuten"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "Vor einer Stunde"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "Vor {hours} Stunden"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "Vor {days} Tag(en)"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "Vor {months} Monaten"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "Vor Monaten"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "Vor Jahren"
 
@@ -482,7 +483,7 @@ msgstr "Kategorien bearbeiten"
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Sicherheitswarnung"
 
@@ -492,71 +493,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktiviere die PHP-Erweiterung für OpenSSL."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Konten  zu übernehmen."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Dein Datenverzeichnis und deine Datein sind vielleicht vom Internet aus erreichbar. Die .htaccess Datei, die ownCloud verwendet, arbeitet nicht richtig. Wir schlagen Dir dringend vor, dass du deinen Webserver so konfigurierst, dass das Datenverzeichnis nicht länger erreichbar ist oder, dass du dein Datenverzeichnis aus dem Dokumenten-root des Webservers bewegst."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Administrator-Konto</strong> anlegen"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Fortgeschritten"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Datenverzeichnis"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Datenbank einrichten"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "wird verwendet"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Datenbank-Benutzer"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Datenbank-Passwort"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Datenbank-Name"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Datenbank-Tablespace"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Datenbank-Host"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Installation abschließen"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "Web-Services unter Ihrer Kontrolle"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Abmelden"
 
@@ -578,14 +583,18 @@ msgstr "Bitte ändere Dein Passwort, um Deinen Account wieder zu schützen."
 msgid "Lost your password?"
 msgstr "Passwort vergessen?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "merken"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Einloggen"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "Zurück"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 06930bfca5c..a016e0c1074 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -28,8 +28,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 00:10+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -38,46 +38,60 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Datei fehlerfrei hochgeladen."
 
-#: ajax/upload.php:25
+#: 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 php.ini"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Die Datei wurde nur teilweise hochgeladen."
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Es wurde keine Datei hochgeladen."
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Temporärer Ordner fehlt."
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Fehler beim Schreiben auf die Festplatte"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Nicht genug Speicherplatz verfügbar"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
@@ -89,11 +103,15 @@ msgstr "Dateien"
 msgid "Unshare"
 msgstr "Nicht mehr freigeben"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Löschen"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Umbenennen"
 
@@ -198,31 +216,31 @@ msgstr "Die URL darf nicht leer sein."
 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:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Bearbeitet"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} Dateien"
 
diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po
index ae8505b00e4..b9692802ff3 100644
--- a/l10n/de/files_trashbin.po
+++ b/l10n/de/files_trashbin.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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -19,31 +19,45 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr "Wiederherstellung ausführen"
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Name"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr "gelöscht"
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} Dateien"
 
diff --git a/l10n/de/files_versions.po b/l10n/de/files_versions.po
index a3e251c142c..e969e096065 100644
--- a/l10n/de/files_versions.po
+++ b/l10n/de/files_versions.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -22,10 +22,45 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Historie"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Dateiversionierung"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 25f769704b0..701892688ca 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -26,8 +26,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -40,6 +40,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden."
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Fehler bei der Anmeldung"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Gruppe existiert bereits"
@@ -64,10 +73,6 @@ msgstr "Ungültige E-Mail Adresse"
 msgid "Unable to delete group"
 msgstr "Gruppe konnte nicht gelöscht werden"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Fehler bei der Anmeldung"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Benutzer konnte nicht gelöscht werden"
@@ -130,7 +135,7 @@ msgstr "Fehler"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Speichern..."
 
@@ -207,67 +212,83 @@ msgstr "Android-Client herunterladen"
 msgid "Download iOS Client"
 msgstr "iOS-Client herunterladen"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Dein Passwort wurde geändert."
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Passwort konnte nicht geändert werden"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "zeigen"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Anzeigename"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "E-Mail"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Deine E-Mail-Adresse"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Sprache"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Hilf bei der Übersetzung"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Verwende diese Adresse, um Deinen Dateimanager mit Deiner ownCloud zu verbinden"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Version"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -301,10 +322,6 @@ msgstr "Unbegrenzt"
 msgid "Other"
 msgstr "Andere"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr "Anzeigename"
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Gruppenadministrator"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index ff8dbae3048..e247c006708 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -222,8 +222,8 @@ msgid "Use TLS"
 msgstr "Nutze TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Verwende dies nicht für SSL-Verbindungen, es wird fehlschlagen."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index 9ec9f4bed29..c67c4205fbf 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -18,14 +18,15 @@
 #   <niko@nik-o-mat.de>, 2012.
 # Phi Lieb <>, 2012.
 #   <Steve_Reichert@gmx.de>, 2013.
+# Susi <>, 2013.
 #   <thomas.mueller@tmit.eu>, 2012.
 #   <transifex.3.mensaje@spamgourmet.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
@@ -67,8 +68,9 @@ msgid "No category to add?"
 msgstr "Keine Kategorie hinzuzufügen?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Kategorie existiert bereits:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr "Die Kategorie '%s' existiert bereits."
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -172,59 +174,59 @@ msgstr "November"
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "Vor 1 Minute"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "Vor {minutes} Minuten"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "Vor einer Stunde"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "Vor {hours} Stunden"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "Vor {days} Tag(en)"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "Vor {months} Monaten"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "Vor Monaten"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "Vor Jahren"
 
@@ -483,7 +485,7 @@ msgstr "Kategorien bearbeiten"
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Sicherheitshinweis"
 
@@ -493,71 +495,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktivieren Sie die PHP-Erweiterung für OpenSSL."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage, die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Ihr Konto zu übernehmen."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich über das Internet erreichbar. Die von ownCloud bereitgestellte .htaccess Datei funktioniert nicht. Wir empfehlen Ihnen dringend, Ihren Webserver so zu konfigurieren, dass das Datenverzeichnis nicht mehr über das Internet erreichbar ist. Alternativ können Sie auch das Datenverzeichnis aus dem Dokumentenverzeichnis des Webservers verschieben."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Administrator-Konto</strong> anlegen"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Fortgeschritten"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Datenverzeichnis"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Datenbank einrichten"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "wird verwendet"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Datenbank-Benutzer"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Datenbank-Passwort"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Datenbank-Name"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Datenbank-Tablespace"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Datenbank-Host"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Installation abschließen"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "Web-Services unter Ihrer Kontrolle"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Abmelden"
 
@@ -579,14 +585,18 @@ msgstr "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern."
 msgid "Lost your password?"
 msgstr "Passwort vergessen?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "merken"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Einloggen"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr "Alternative Logins"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "Zurück"
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 474d7e5ab28..4ff85767805 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -22,6 +22,7 @@
 # Phi Lieb <>, 2012.
 # Phillip Schichtel <quick_wango@code-infection.de>, 2013.
 #   <Steve_Reichert@gmx.de>, 2013.
+# Susi <>, 2013.
 #   <thomas.mueller@tmit.eu>, 2012.
 # Thomas Müller <>, 2012.
 #   <transifex.3.mensaje@spamgourmet.com>, 2012.
@@ -29,9 +30,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 19:21+0000\n"
-"Last-Translator: quick_wango <quick_wango@code-infection.de>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,46 +40,60 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 
-#: ajax/upload.php:24
+#: 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."
 
-#: ajax/upload.php:25
+#: 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 php.ini"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Die Datei wurde nur teilweise hochgeladen."
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Es wurde keine Datei hochgeladen."
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Der temporäre Ordner fehlt."
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Fehler beim Schreiben auf die Festplatte"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Nicht genügend Speicherplatz verfügbar"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
@@ -90,11 +105,15 @@ msgstr "Dateien"
 msgid "Unshare"
 msgstr "Nicht mehr freigeben"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr "Entgültig löschen"
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Löschen"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Umbenennen"
 
@@ -199,31 +218,31 @@ msgstr "Die URL darf nicht leer sein."
 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:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Bearbeitet"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} Dateien"
 
diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po
index 8d49245d9f5..af3fe444bfe 100644
--- a/l10n/de_DE/files_encryption.po
+++ b/l10n/de_DE/files_encryption.po
@@ -8,13 +8,14 @@
 #   <driz@i2pmail.org>, 2012.
 # Marc-Andre Husyk <member@wue.de>, 2013.
 # Marcel Kühlhorn <susefan93@gmx.de>, 2013.
+# Susi <>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-08 00:09+0100\n"
+"PO-Revision-Date: 2013-02-07 08:20+0000\n"
+"Last-Translator: Susi <>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,15 +51,15 @@ msgstr "Verschlüsselung"
 
 #: templates/settings-personal.php:7
 msgid "File encryption is enabled."
-msgstr ""
+msgstr "Datei-Verschlüsselung ist aktiviert"
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "Die folgenden Datei-Typen werden nicht verschlüsselt:"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "Die folgenden Datei-Typen von der Verschlüsselung ausnehmen:"
 
 #: templates/settings.php:12
 msgid "None"
diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po
index f08dcbd0043..755e0968dbd 100644
--- a/l10n/de_DE/files_trashbin.po
+++ b/l10n/de_DE/files_trashbin.po
@@ -5,12 +5,13 @@
 # Translators:
 # I Robot <owncloud-bot@tmit.eu>, 2013.
 # Phillip Schichtel <quick_wango@code-infection.de>, 2013.
+# Susi <>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
@@ -19,31 +20,45 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr "Führe die Wiederherstellung aus"
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr "Datei entgültig löschen"
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Name"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr "Gelöscht"
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} Dateien"
 
diff --git a/l10n/de_DE/files_versions.po b/l10n/de_DE/files_versions.po
index bef0ee6b762..e6c6d61cb21 100644
--- a/l10n/de_DE/files_versions.po
+++ b/l10n/de_DE/files_versions.po
@@ -6,15 +6,16 @@
 #   <blobbyjj@ymail.com>, 2012.
 # I Robot <thomas.mueller@tmit.eu>, 2012.
 #   <mail@felixmoeller.de>, 2012.
+#  <niko@nik-o-mat.de>, 2013.
 #   <niko@nik-o-mat.de>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 12:20+0000\n"
+"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,10 +23,45 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr "Erfolgreich"
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr "Fehlgeschlagen"
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr "keine älteren Versionen verfügbar"
+
+#: history.php:73
+msgid "No path specified"
+msgstr "Kein Pfad angegeben"
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Historie"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Dateiversionierung"
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index ffbcc368ff6..e198138298e 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -20,6 +20,7 @@
 # Phillip Schichtel <quick_wango@code-infection.de>, 2013.
 #   <seeed@freenet.de>, 2012.
 #  <stefan.niedermann@googlemail.com>, 2013.
+# Susi <>, 2013.
 #   <thomas.mueller@tmit.eu>, 2012.
 #   <transifex-2.7.mensaje@spamgourmet.com>, 2012.
 #   <transifex.3.mensaje@spamgourmet.com>, 2012.
@@ -28,9 +29,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 00:10+0000\n"
-"Last-Translator: Lukas Reschke <lukas@statuscode.ch>\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 08:10+0000\n"
+"Last-Translator: Susi <>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,6 +43,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden."
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Fehler bei der Anmeldung"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr "Das Ändern des Anzeigenamens ist nicht möglich"
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Die Gruppe existiert bereits"
@@ -66,10 +76,6 @@ msgstr "Ungültige E-Mail-Adresse"
 msgid "Unable to delete group"
 msgstr "Die Gruppe konnte nicht gelöscht werden"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Fehler bei der Anmeldung"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Der Benutzer konnte nicht gelöscht werden"
@@ -132,7 +138,7 @@ msgstr "Fehler"
 msgid "Updated"
 msgstr "Geupdated"
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Speichern..."
 
@@ -209,67 +215,83 @@ msgstr "Android-Client herunterladen"
 msgid "Download iOS Client"
 msgstr "iOS-Client herunterladen"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Ihr Passwort wurde geändert."
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Das Passwort konnte nicht geändert werden"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "zeigen"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Anzeigename"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr "Dein Anzeigename wurde geändert"
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr "Das Ändern deines Anzeigenamens ist nicht möglich"
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr "Anzeigenamen ändern"
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "E-Mail"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Ihre E-Mail-Adresse"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Sprache"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Helfen Sie bei der Übersetzung"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Verwenden Sie diese Adresse, um Ihren Dateimanager mit Ihrer ownCloud zu verbinden"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Version"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -303,10 +325,6 @@ msgstr "Unbegrenzt"
 msgid "Other"
 msgstr "Andere"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr "Anzeigename"
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Gruppenadministrator"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 663cfdb1af7..0633de147c9 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 13:50+0000\n"
-"Last-Translator: Susi <>\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -224,8 +224,8 @@ msgid "Use TLS"
 msgstr "Nutze TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Verwenden Sie dies nicht für SSL-Verbindungen, es wird fehlschlagen."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 1f2543369b0..6947ca9a5cf 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -58,8 +58,9 @@ msgid "No category to add?"
 msgstr "Δεν έχετε κατηγορία να προσθέσετε;"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Αυτή η κατηγορία υπάρχει ήδη:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -163,59 +164,59 @@ msgstr "Νοέμβριος"
 msgid "December"
 msgstr "Δεκέμβριος"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "δευτερόλεπτα πριν"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 λεπτό πριν"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} λεπτά πριν"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "1 ώρα πριν"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{hours} ώρες πριν"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "σήμερα"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "χτες"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} ημέρες πριν"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "τελευταίο μήνα"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{months} μήνες πριν"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "μήνες πριν"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "τελευταίο χρόνο"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "χρόνια πριν"
 
@@ -474,7 +475,7 @@ msgstr "Επεξεργασία κατηγοριών"
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Προειδοποίηση Ασφαλείας"
 
@@ -484,71 +485,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Δεν είναι διαθέσιμο το πρόσθετο δημιουργίας τυχαίων αριθμών ασφαλείας, παρακαλώ ενεργοποιήστε το πρόσθετο της PHP, OpenSSL."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Χωρίς το πρόσθετο δημιουργίας τυχαίων αριθμών ασφαλείας, μπορεί να διαρρεύσει ο λογαριασμός σας από επιθέσεις στο διαδίκτυο."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Ο κατάλογος data και τα αρχεία σας πιθανόν να είναι διαθέσιμα στο διαδίκτυο. Το αρχείο .htaccess που παρέχει το ownCloud δεν δουλεύει. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος data να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο data έξω από τον κατάλογο του διακομιστή."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Για προχωρημένους"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Φάκελος δεδομένων"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Ρύθμιση της βάσης δεδομένων"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "θα χρησιμοποιηθούν"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Χρήστης της βάσης δεδομένων"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Συνθηματικό βάσης δεδομένων"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Όνομα βάσης δεδομένων"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Κενά Πινάκων Βάσης Δεδομένων"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Διακομιστής βάσης δεδομένων"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Ολοκλήρωση εγκατάστασης"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "Υπηρεσίες web υπό τον έλεγχό σας"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Αποσύνδεση"
 
@@ -570,14 +575,18 @@ msgstr "Παρακαλώ αλλάξτε το συνθηματικό σας γι�
 msgid "Lost your password?"
 msgstr "Ξεχάσατε το συνθηματικό σας;"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "απομνημόνευση"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Είσοδος"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "προηγούμενο"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 233012d37cb..8466d5bc77a 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -25,46 +25,60 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Δεν υπάρχει σφάλμα, το αρχείο εστάλει επιτυχώς"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Το απεσταλμένο αρχείο ξεπερνά την οδηγία upload_max_filesize στο php.ini:"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Το αρχείο υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"MAX_FILE_SIZE\" που έχει οριστεί στην HTML φόρμα"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Το αρχείο εστάλει μόνο εν μέρει"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Κανένα αρχείο δεν στάλθηκε"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Λείπει ο προσωρινός φάκελος"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Αποτυχία εγγραφής στο δίσκο"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Δεν υπάρχει αρκετός διαθέσιμος χώρος"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Μη έγκυρος φάκελος."
 
@@ -76,11 +90,15 @@ msgstr "Αρχεία"
 msgid "Unshare"
 msgstr "Διακοπή κοινής χρήσης"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Μετονομασία"
 
@@ -185,31 +203,31 @@ msgstr "Η URL δεν πρέπει να είναι κενή."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από ο Owncloud"
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Όνομα"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Τροποποιήθηκε"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 φάκελος"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} φάκελοι"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 αρχείο"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} αρχεία"
 
diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po
index e29ec4d6caf..27cd5e21b4c 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Όνομα"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 φάκελος"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} φάκελοι"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 αρχείο"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} αρχεία"
 
diff --git a/l10n/el/files_versions.po b/l10n/el/files_versions.po
index 3812c4bda0d..7f82eaf81c7 100644
--- a/l10n/el/files_versions.po
+++ b/l10n/el/files_versions.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -20,10 +20,45 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Ιστορικό"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Εκδόσεις Αρχείων"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index ffd6028e9c1..c6c5dfb10f0 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -33,6 +33,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Σφάλμα στην φόρτωση της λίστας από το App Store"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Σφάλμα πιστοποίησης"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Η ομάδα υπάρχει ήδη"
@@ -57,10 +66,6 @@ msgstr "Μη έγκυρο email"
 msgid "Unable to delete group"
 msgstr "Αδυναμία διαγραφής ομάδας"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Σφάλμα πιστοποίησης"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Αδυναμία διαγραφής χρήστη"
@@ -123,7 +128,7 @@ msgstr "Σφάλμα"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Αποθήκευση..."
 
@@ -200,67 +205,83 @@ msgstr "Λήψη Προγράμματος Android"
 msgid "Download iOS Client"
 msgstr "Λήψη Προγράμματος iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Συνθηματικό"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Το συνθηματικό σας έχει αλλάξει"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Τρέχων συνθηματικό"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Νέο συνθηματικό"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "εμφάνιση"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Αλλαγή συνθηματικού"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Η διεύθυνση ηλεκτρονικού ταχυδρομείου σας"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση συνθηματικού"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Γλώσσα"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Βοηθήστε στη μετάφραση"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Χρήση αυτής της διεύθυνσης για σύνδεση στο ownCloud με τον διαχειριστή αρχείων σας"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Έκδοση"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -294,10 +315,6 @@ msgstr "Απεριόριστο"
 msgid "Other"
 msgstr "Άλλα"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Ομάδα Διαχειριστών"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 0bc933973ea..972b0601dfa 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -218,8 +218,8 @@ msgid "Use TLS"
 msgstr "Χρήση TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Μην χρησιμοποιείτε για συνδέσεις SSL, θα αποτύχει."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index f9f3c0cd8f2..15f0635aa27 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -53,8 +53,9 @@ msgid "No category to add?"
 msgstr "Ĉu neniu kategorio estas aldonota?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Ĉi tiu kategorio jam ekzistas: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -158,59 +159,59 @@ msgstr "Novembro"
 msgid "December"
 msgstr "Decembro"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Agordo"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "sekundoj antaŭe"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "antaŭ 1 minuto"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "antaŭ {minutes} minutoj"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "antaŭ 1 horo"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "antaŭ {hours} horoj"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "hodiaŭ"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "hieraŭ"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "antaŭ {days} tagoj"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "lastamonate"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "antaŭ {months} monatoj"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "monatoj antaŭe"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "lastajare"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "jaroj antaŭe"
 
@@ -469,7 +470,7 @@ msgstr "Redakti kategoriojn"
 msgid "Add"
 msgstr "Aldoni"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Sekureca averto"
 
@@ -479,71 +480,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Ne disponeblas sekura generilo de hazardaj numeroj; bonvolu kapabligi la OpenSSL-kromaĵon por PHP."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr ""
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Krei <strong>administran konton</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Progresinta"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Datuma dosierujo"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Agordi la datumbazon"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "estos uzata"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Datumbaza uzanto"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Datumbaza pasvorto"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Datumbaza nomo"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Datumbaza tabelospaco"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Datumbaza gastigo"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Fini la instalon"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "TTT-servoj sub via kontrolo"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Elsaluti"
 
@@ -565,14 +570,18 @@ msgstr "Bonvolu ŝanĝi vian pasvorton por sekurigi vian konton ree."
 msgid "Lost your password?"
 msgstr "Ĉu vi perdis vian pasvorton?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "memori"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Ensaluti"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "maljena"
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index d4406185134..139cd4a827f 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -20,46 +20,60 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Neniu dosiero alŝutiĝis. Nekonata eraro."
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Ne estas eraro, la dosiero alŝutiĝis sukcese"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "La dosiero alŝutita superas la regulon upload_max_filesize el php.ini: "
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "La dosiero alŝutita superas la regulon MAX_FILE_SIZE, kiu estas difinita en la HTML-formularo"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "La alŝutita dosiero nur parte alŝutiĝis"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Neniu dosiero estas alŝutita"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Mankas tempa dosierujo"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Malsukcesis skribo al disko"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Ne haveblas sufiĉa spaco"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Nevalida dosierujo."
 
@@ -71,11 +85,15 @@ msgstr "Dosieroj"
 msgid "Unshare"
 msgstr "Malkunhavigi"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Forigi"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Alinomigi"
 
@@ -180,31 +198,31 @@ msgstr "URL ne povas esti malplena."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nevalida dosierujnomo. Uzo de “Shared” rezervatas de Owncloud."
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Nomo"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Grando"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Modifita"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 dosierujo"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} dosierujoj"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 dosiero"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} dosierujoj"
 
diff --git a/l10n/eo/files_trashbin.po b/l10n/eo/files_trashbin.po
index c1491a33446..407ed42d6da 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Nomo"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 dosierujo"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} dosierujoj"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 dosiero"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} dosierujoj"
 
diff --git a/l10n/eo/files_versions.po b/l10n/eo/files_versions.po
index 53a59b49120..6e7f83b9ade 100644
--- a/l10n/eo/files_versions.po
+++ b/l10n/eo/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Historio"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Dosiereldonigo"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index f422c123005..d48c43e7b6f 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -24,6 +24,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Ne eblis ŝargi liston el aplikaĵovendejo"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Aŭtentiga eraro"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "La grupo jam ekzistas"
@@ -48,10 +57,6 @@ msgstr "Nevalida retpoŝtadreso"
 msgid "Unable to delete group"
 msgstr "Ne eblis forigi la grupon"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Aŭtentiga eraro"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Ne eblis forigi la uzanton"
@@ -114,7 +119,7 @@ msgstr "Eraro"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Konservante..."
 
@@ -191,67 +196,83 @@ msgstr "Elŝuti Android-klienton"
 msgid "Download iOS Client"
 msgstr "Elŝuti iOS-klienton"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Pasvorto"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Via pasvorto ŝanĝiĝis"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Ne eblis ŝanĝi vian pasvorton"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Nuna pasvorto"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Nova pasvorto"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "montri"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Ŝanĝi la pasvorton"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Retpoŝto"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Via retpoŝta adreso"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Enigu retpoŝtadreson por kapabligi pasvortan restaŭron"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Lingvo"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Helpu traduki"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Uzu ĉi tiun adreson por konekti al via ownCloud vian dosieradministrilon"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Eldono"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -285,10 +306,6 @@ msgstr "Senlima"
 msgid "Other"
 msgstr "Alia"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grupadministranto"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 9bdab74d0f3..ac325f3f01d 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -215,8 +215,8 @@ msgid "Use TLS"
 msgstr "Uzi TLS-on"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Ne uzu ĝin por SSL-konektoj, ĝi malsukcesos."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index ecd1cbf9176..ff3f6b2cd57 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -15,13 +15,14 @@
 # Rubén Trujillo <rubentrf@gmail.com>, 2012.
 #   <sergioballesterossolanas@gmail.com>, 2011-2012.
 #   <sergio@entrecables.com>, 2012.
+# Vladimir Martinez Sierra <vladimirmartinezsierra@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
-"Last-Translator: felix.liberio <felix.liberio@gmail.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -62,8 +63,9 @@ msgid "No category to add?"
 msgstr "¿Ninguna categoría para añadir?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Esta categoría ya existe: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr "Esta categoria ya existe: %s"
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -167,59 +169,59 @@ msgstr "Noviembre"
 msgid "December"
 msgstr "Diciembre"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "hace segundos"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "hace 1 minuto"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "hace {minutes} minutos"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "Hace 1 hora"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "Hace {hours} horas"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "hace {days} días"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "mes pasado"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "Hace {months} meses"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "hace meses"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "año pasado"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "hace años"
 
@@ -478,7 +480,7 @@ msgstr "Editar categorías"
 msgid "Add"
 msgstr "Añadir"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Advertencia de seguridad"
 
@@ -488,71 +490,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "No está disponible un generador de números aleatorios seguro, por favor habilite la extensión OpenSSL de PHP."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 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."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Su directorio de datos y sus archivos están probablemente accesibles desde internet. El archivo .htaccess que ownCloud provee no está funcionando. Sugerimos fuertemente que configure su servidor web de manera que el directorio de datos ya no esté accesible o mueva el directorio de datos fuera del documento raíz de su servidor web."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea una <strong>cuenta de administrador</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Directorio de almacenamiento"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Configurar la base de datos"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "se utilizarán"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Usuario de la base de datos"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Contraseña de la base de datos"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Nombre de la base de datos"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Espacio de tablas de la base de datos"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Host de la base de datos"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Completar la instalación"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "servicios web bajo tu control"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Salir"
 
@@ -574,14 +580,18 @@ msgstr "Por favor cambie su contraseña para asegurar su cuenta nuevamente."
 msgid "Lost your password?"
 msgstr "¿Has perdido tu contraseña?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "recuérdame"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Entrar"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr "Nombre de usuarios alternativos"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "anterior"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index d5984a7cbf7..589961db7a0 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 22:50+0000\n"
-"Last-Translator: msvladimir <vladimirmartinezsierra@gmail.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,6 +27,20 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Fallo no se subió el fichero"
@@ -63,8 +77,8 @@ msgid "Failed to write to disk"
 msgstr "La escritura en disco ha fallado"
 
 #: ajax/upload.php:52
-msgid "Not enough space available"
-msgstr "No hay suficiente espacio disponible"
+msgid "Not enough storage available"
+msgstr ""
 
 #: ajax/upload.php:83
 msgid "Invalid directory."
@@ -78,11 +92,15 @@ msgstr "Archivos"
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr "Eliminar permanentemente"
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Eliminar"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Renombrar"
 
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index cfd77783345..b7d69adaf02 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -6,13 +6,14 @@
 # Felix Liberio <felix.liberio@gmail.com>, 2013.
 #   <juanma@kde.org.ar>, 2012.
 # Raul Fernandez Garcia <raulfg3@gmail.com>, 2013.
+# Vladimir Martinez Sierra <vladimirmartinezsierra@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-05 23:10+0000\n"
+"Last-Translator: msvladimir <vladimirmartinezsierra@gmail.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"
@@ -48,15 +49,15 @@ msgstr "Cifrado"
 
 #: templates/settings-personal.php:7
 msgid "File encryption is enabled."
-msgstr ""
+msgstr "La encriptacion de archivo esta activada."
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "Los siguientes tipos de archivo no seran encriptados:"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "Excluir los siguientes tipos de archivo de la encriptacion:"
 
 #: templates/settings.php:12
 msgid "None"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index 14f67707885..7e95d500a1b 100644
--- a/l10n/es/files_trashbin.po
+++ b/l10n/es/files_trashbin.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-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 22:40+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 00:30+0000\n"
 "Last-Translator: msvladimir <vladimirmartinezsierra@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -18,31 +18,45 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr "No se puede eliminar %s permanentemente"
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr "No se puede restaurar %s"
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr "Restaurar"
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr "Eliminar archivo permanentemente"
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Nombre"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr "Eliminado"
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} carpetas"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} archivos"
 
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
index 41ca2e67dad..279601b80de 100644
--- a/l10n/es/files_versions.po
+++ b/l10n/es/files_versions.po
@@ -7,13 +7,14 @@
 #   <juanma@kde.org.ar>, 2012.
 # Rubén Trujillo <rubentrf@gmail.com>, 2012.
 #   <sergio@entrecables.com>, 2012.
+# Vladimir Martinez Sierra <vladimirmartinezsierra@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 00:40+0000\n"
+"Last-Translator: msvladimir <vladimirmartinezsierra@gmail.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"
@@ -21,10 +22,45 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr "No se puede revertir: %s"
+
+#: history.php:40
+msgid "success"
+msgstr "exitoso"
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr "El archivo %s fue revertido a la version %s"
+
+#: history.php:49
+msgid "failure"
+msgstr "fallo"
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr "El archivo %s no puede ser revertido a la version %s"
+
+#: history.php:68
+msgid "No old versions available"
+msgstr "No hay versiones antiguas disponibles"
+
+#: history.php:73
+msgid "No path specified"
+msgstr "Ruta no especificada"
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Historial"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr "Revertir un archivo a una versión anterior haciendo clic en el boton de revertir"
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Versionado de archivos"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 5087cce0920..ef23546dea6 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 23:00+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 00:30+0000\n"
 "Last-Translator: msvladimir <vladimirmartinezsierra@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Imposible cargar la lista desde el App Store"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Error de autenticación"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr "Incapaz de cambiar el nombre"
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "El grupo ya existe"
@@ -58,10 +67,6 @@ msgstr "Correo no válido"
 msgid "Unable to delete group"
 msgstr "No se pudo eliminar el grupo"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Error de autenticación"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "No se pudo eliminar el usuario"
@@ -124,7 +129,7 @@ msgstr "Error"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Guardando..."
 
@@ -229,39 +234,55 @@ msgstr "mostrar"
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: templates/personal.php:38
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Nombre a mostrar"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr "Su nombre fue cambiado"
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr "Incapaz de cambiar su nombre"
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr "Cambiar nombre"
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: templates/personal.php:39
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Tu dirección de correo"
 
-#: templates/personal.php:40
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Escribe una dirección de correo electrónico para restablecer la contraseña"
 
-#: templates/personal.php:46 templates/personal.php:47
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:52
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Ayúdanos a traducir"
 
-#: templates/personal.php:57
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:59
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Use esta dirección para conectarse a su cuenta de ownCloud en el administrador de archivos"
 
-#: templates/personal.php:68
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Version"
 
-#: templates/personal.php:70
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -295,10 +316,6 @@ msgstr "Ilimitado"
 msgid "Other"
 msgstr "Otro"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr "Nombre a mostrar"
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grupo admin"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 1934ad18712..139d0cb69b8 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 00:30+0000\n"
 "Last-Translator: msvladimir <vladimirmartinezsierra@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -221,8 +221,8 @@ msgid "Use TLS"
 msgstr "Usar TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "No usarlo para SSL, habrá error."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr "No usar adicionalmente para conecciones LDAPS, estas fallaran"
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index b8625fa972f..b13721f69df 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,8 +53,9 @@ msgid "No category to add?"
 msgstr "¿Ninguna categoría para añadir?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Esta categoría ya existe: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -158,59 +159,59 @@ msgstr "Noviembre"
 msgid "December"
 msgstr "Diciembre"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "hace 1 minuto"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "hace {minutes} minutos"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "Hace 1 hora"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{hours} horas atrás"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "hace {days} días"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "el mes pasado"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{months} meses atrás"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "el año pasado"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "años atrás"
 
@@ -469,7 +470,7 @@ msgstr "Editar categorías"
 msgid "Add"
 msgstr "Agregar"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Advertencia de seguridad"
 
@@ -479,71 +480,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "No hay disponible ningún generador de números aleatorios seguro. Por favor habilitá la extensión OpenSSL de PHP."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 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 tu contraseña y tomar control de tu cuenta."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Tu directorio de datos y tus archivos son probablemente accesibles desde internet. El archivo .htaccess provisto por ownCloud no está funcionando. Te sugerimos que configures tu servidor web de manera que el directorio de datos ya no esté accesible, o que muevas el directorio de datos afuera del directorio raíz de tu servidor web."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear una <strong>cuenta de administrador</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Directorio de almacenamiento"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Configurar la base de datos"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "se utilizarán"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Usuario de la base de datos"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Contraseña de la base de datos"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Nombre de la base de datos"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Espacio de tablas de la base de datos"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Host de la base de datos"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Completar la instalación"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "servicios web sobre los que tenés control"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Cerrar la sesión"
 
@@ -565,14 +570,18 @@ msgstr "Por favor, cambiá tu contraseña para fortalecer nuevamente la segurida
 msgid "Lost your password?"
 msgstr "¿Perdiste tu contraseña?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "recordame"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Entrar"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "anterior"
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index 16fb351cdfb..45bc777add8 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -20,46 +20,60 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "El archivo no fue subido. Error desconocido"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "No se han producido errores, el archivo se ha subido con éxito"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "El archivo que intentás subir excede el tamaño definido por upload_max_filesize en el php.ini:"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El archivo que intentás subir sobrepasa el tamaño definido por la variable MAX_FILE_SIZE especificada en el formulario HTML"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "El archivo que intentás subir solo se subió parcialmente"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "El archivo no fue subido"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Falta un directorio temporal"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Error al escribir en el disco"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "No hay suficiente espacio disponible"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Directorio invalido."
 
@@ -71,11 +85,15 @@ msgstr "Archivos"
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Borrar"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Cambiar nombre"
 
@@ -109,7 +127,7 @@ msgstr "reemplazado {new_name} con {old_name}"
 
 #: js/filelist.js:280
 msgid "perform delete operation"
-msgstr ""
+msgstr "Eliminar"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -180,31 +198,31 @@ msgstr "La URL no puede estar vacía"
 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:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 directorio"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} directorios"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} archivos"
 
@@ -262,7 +280,7 @@ msgstr "Desde enlace"
 
 #: templates/index.php:40
 msgid "Trash"
-msgstr ""
+msgstr "Papelera"
 
 #: templates/index.php:46
 msgid "Cancel upload"
@@ -296,4 +314,4 @@ msgstr "Escaneo actual"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "Actualizando el cache del sistema de archivos"
diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po
index 7352752bf48..c50739188cc 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Nombre"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 directorio"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} directorios"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} archivos"
 
diff --git a/l10n/es_AR/files_versions.po b/l10n/es_AR/files_versions.po
index 6ab1eed54d3..e19644ccc5b 100644
--- a/l10n/es_AR/files_versions.po
+++ b/l10n/es_AR/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Historia"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Versionado de archivos"
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index 8310f58c95c..a9d2e183b6e 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -24,6 +24,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Imposible cargar la lista desde el App Store"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Error al autenticar"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "El grupo ya existe"
@@ -48,10 +57,6 @@ msgstr "el e-mail no es válido "
 msgid "Unable to delete group"
 msgstr "No fue posible eliminar el grupo"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Error al autenticar"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "No fue posible eliminar el usuario"
@@ -114,7 +119,7 @@ msgstr "Error"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Guardando..."
 
@@ -191,67 +196,83 @@ msgstr "Descargar cliente de Android"
 msgid "Download iOS Client"
 msgstr "Descargar cliente de iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Tu contraseña fue cambiada"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "No fue posible cambiar tu contraseña"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Nueva contraseña:"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "mostrar"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Nombre a mostrar"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Tu dirección de e-mail"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Escribí una dirección de correo electrónico para restablecer la contraseña"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Ayudanos a traducir"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Utiliza esta dirección para conectarte con ownCloud en tu Administrador de Archivos"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Versión"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -285,10 +306,6 @@ msgstr "Ilimitado"
 msgid "Other"
 msgstr "Otro"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr "Nombre a mostrar"
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grupo Administrador"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index e6a7fb9d269..b0aad05a15d 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -22,11 +22,11 @@ msgstr ""
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Fallo al borrar la configuración del servidor"
 
 #: ajax/testConfiguration.php:35
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "La configuración es valida y la conexión pudo ser establecida."
 
 #: ajax/testConfiguration.php:37
 msgid ""
@@ -50,27 +50,27 @@ msgstr ""
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr ""
+msgstr "¿Mantener preferencias?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
-msgstr ""
+msgstr "No se pudo añadir la configuración del servidor"
 
 #: js/settings.js:121
 msgid "Connection test succeeded"
-msgstr ""
+msgstr "El este de conexión ha sido completado satisfactoriamente"
 
 #: js/settings.js:126
 msgid "Connection test failed"
-msgstr ""
+msgstr "Falló es test de conexión"
 
 #: js/settings.js:136
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "¿Realmente desea borrar la configuración actual del servidor?"
 
 #: js/settings.js:137
 msgid "Confirm Deletion"
-msgstr ""
+msgstr "Confirmar borrado"
 
 #: templates/settings.php:8
 msgid ""
@@ -87,11 +87,11 @@ msgstr "<b>Atención:</b> El módulo PHP LDAP no está instalado, este elemento
 
 #: templates/settings.php:15
 msgid "Server configuration"
-msgstr ""
+msgstr "Configuración del Servidor"
 
 #: templates/settings.php:17
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "Añadir Configuración del Servidor"
 
 #: templates/settings.php:21
 msgid "Host"
@@ -175,11 +175,11 @@ msgstr "Sin ninguna plantilla, p. ej.: \"objectClass=posixGroup\"."
 
 #: templates/settings.php:31
 msgid "Connection Settings"
-msgstr ""
+msgstr "Configuración de Conección"
 
 #: templates/settings.php:33
 msgid "Configuration Active"
-msgstr ""
+msgstr "Configuración activa"
 
 #: templates/settings.php:33
 msgid "When unchecked, this configuration will be skipped."
@@ -205,7 +205,7 @@ msgstr ""
 
 #: templates/settings.php:37
 msgid "Disable Main Server"
-msgstr ""
+msgstr "Deshabilitar el Servidor Principal"
 
 #: templates/settings.php:37
 msgid "When switched on, ownCloud will only connect to the replica server."
@@ -216,8 +216,8 @@ msgid "Use TLS"
 msgstr "Usar TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "No usarlo para SSL, dará error."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
@@ -243,7 +243,7 @@ msgstr "en segundos. Cambiarlo vacía la cache."
 
 #: templates/settings.php:43
 msgid "Directory Settings"
-msgstr ""
+msgstr "Configuración de Directorio"
 
 #: templates/settings.php:45
 msgid "User Display Name Field"
@@ -295,7 +295,7 @@ msgstr "Asociación Grupo-Miembro"
 
 #: templates/settings.php:53
 msgid "Special Attributes"
-msgstr ""
+msgstr "Atributos Especiales"
 
 #: templates/settings.php:56
 msgid "in bytes"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 319bddaf875..54c76b77460 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -51,8 +51,9 @@ msgid "No category to add?"
 msgstr "Pole kategooriat, mida lisada?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "See kategooria on juba olemas: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -156,59 +157,59 @@ msgstr "November"
 msgid "December"
 msgstr "Detsember"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Seaded"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "sekundit tagasi"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 minut tagasi"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutit tagasi"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "täna"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "eile"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} päeva tagasi"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "viimasel kuul"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "kuu tagasi"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "viimasel aastal"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "aastat tagasi"
 
@@ -467,7 +468,7 @@ msgstr "Muuda kategooriaid"
 msgid "Add"
 msgstr "Lisa"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Turvahoiatus"
 
@@ -477,71 +478,75 @@ msgid ""
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr ""
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Loo <strong>admini konto</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Lisavalikud"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Andmete kaust"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Seadista andmebaasi"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "kasutatakse"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Andmebaasi kasutaja"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Andmebaasi parool"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Andmebasi nimi"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Andmebaasi tabeliruum"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Andmebaasi host"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Lõpeta seadistamine"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "veebiteenused sinu kontrolli all"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Logi välja"
 
@@ -563,14 +568,18 @@ msgstr "Palun muuda parooli, et oma kasutajakonto uuesti turvata."
 msgid "Lost your password?"
 msgstr "Kaotasid oma parooli?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "pea meeles"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Logi sisse"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "eelm"
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index deecc6e8688..c42827d819d 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.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-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -19,46 +19,60 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Ühtegi faili ei laetud üles. Tundmatu viga"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Ühtegi viga pole, fail on üles laetud"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Üles laetud faili suurus ületab HTML vormis määratud upload_max_filesize suuruse"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fail laeti üles ainult osaliselt"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Ühtegi faili ei laetud üles"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Ajutiste failide kaust puudub"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Kettale kirjutamine ebaõnnestus"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -70,11 +84,15 @@ msgstr "Failid"
 msgid "Unshare"
 msgstr "Lõpeta jagamine"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Kustuta"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "ümber"
 
@@ -179,31 +197,31 @@ msgstr "URL ei saa olla tühi."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Suurus"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Muudetud"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 kaust"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} kausta"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 fail"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} faili"
 
diff --git a/l10n/et_EE/files_trashbin.po b/l10n/et_EE/files_trashbin.po
index 818c4c31a5d..e4e1d3e4372 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,31 +17,45 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Nimi"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 kaust"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} kausta"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 fail"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} faili"
 
diff --git a/l10n/et_EE/files_versions.po b/l10n/et_EE/files_versions.po
index a0309a22fc6..b35f2b2c7e7 100644
--- a/l10n/et_EE/files_versions.po
+++ b/l10n/et_EE/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Ajalugu"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Failide versioonihaldus"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 1dbc6e9f6fd..bd9993e5ebc 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -23,6 +23,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "App Sotre'i nimekirja laadimine ebaõnnestus"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Autentimise viga"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Grupp on juba olemas"
@@ -47,10 +56,6 @@ msgstr "Vigane e-post"
 msgid "Unable to delete group"
 msgstr "Keela grupi kustutamine"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Autentimise viga"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Keela kasutaja kustutamine"
@@ -113,7 +118,7 @@ msgstr "Viga"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Salvestamine..."
 
@@ -190,67 +195,83 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Parool"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Sinu parooli on muudetud"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Sa ei saa oma parooli muuta"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Praegune parool"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Uus parool"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "näita"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Muuda parooli"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Sinu e-posti aadress"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Keel"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Aita tõlkida"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -284,10 +305,6 @@ msgstr ""
 msgid "Other"
 msgstr "Muu"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grupi admin"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index fe16678ea5e..83400a76258 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -214,8 +214,8 @@ msgid "Use TLS"
 msgstr "Kasutaja TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Ära kasuta seda SSL ühenduse jaoks, see ei toimi."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 33b40f3114c..faa3a2a3a3b 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,8 +54,9 @@ msgid "No category to add?"
 msgstr "Ez dago gehitzeko kategoriarik?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Kategoria hau dagoeneko existitzen da:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -159,59 +160,59 @@ msgstr "Azaroa"
 msgid "December"
 msgstr "Abendua"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "segundu"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "orain dela minutu 1"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "orain dela {minutes} minutu"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "orain dela ordu bat"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "orain dela {hours} ordu"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "gaur"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "atzo"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "orain dela {days} egun"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "joan den hilabetean"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "orain dela {months} hilabete"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "hilabete"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "joan den urtean"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "urte"
 
@@ -470,7 +471,7 @@ msgstr "Editatu kategoriak"
 msgid "Add"
 msgstr "Gehitu"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Segurtasun abisua"
 
@@ -480,71 +481,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Ez dago hausazko zenbaki sortzaile segururik eskuragarri, mesedez gatiu PHP OpenSSL extensioa."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Hausazko zenbaki sortzaile segururik gabe erasotzaile batek pasahitza berrezartzeko kodeak iragarri ditzake eta zure kontuaz jabetu."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke. ownCloudek emandako .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Sortu <strong>kudeatzaile kontu<strong> bat"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Datuen karpeta"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Konfiguratu datu basea"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "erabiliko da"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Datubasearen erabiltzailea"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Datubasearen pasahitza"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Datubasearen izena"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Datu basearen taula-lekua"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Datubasearen hostalaria"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Bukatu konfigurazioa"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "web zerbitzuak zure kontrolpean"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Saioa bukatu"
 
@@ -566,14 +571,18 @@ msgstr "Mesedez aldatu zure pasahitza zure kontua berriz segurtatzeko."
 msgid "Lost your password?"
 msgstr "Galdu duzu pasahitza?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "gogoratu"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Hasi saioa"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "aurrekoa"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 2c3f16305dd..e32bbe4ed2f 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -21,46 +21,60 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Ez da fitxategirik igo. Errore ezezaguna"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Ez da arazorik izan, fitxategia ongi igo da"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Igotako fitxategiak php.ini fitxategian ezarritako upload_max_filesize muga gainditu du:"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Igotako fitxategiaren tamaina HTML inprimakiko MAX_FILESIZE direktiban adierazitakoa baino handiagoa da"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Igotako fitxategiaren zati bat baino gehiago ez da igo"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Ez da fitxategirik igo"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Aldi baterako karpeta falta da"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Errore bat izan da diskoan idazterakoan"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Ez dago leku nahikorik."
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Baliogabeko karpeta."
 
@@ -72,11 +86,15 @@ msgstr "Fitxategiak"
 msgid "Unshare"
 msgstr "Ez elkarbanatu"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Berrizendatu"
 
@@ -181,31 +199,31 @@ msgstr "URLa ezin da hutsik egon."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Baliogabeako karpeta izena. 'Shared' izena Owncloudek erreserbatzen du"
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Izena"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Tamaina"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Aldatuta"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "karpeta bat"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} karpeta"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "fitxategi bat"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} fitxategi"
 
diff --git a/l10n/eu/files_trashbin.po b/l10n/eu/files_trashbin.po
index a0ee131403b..70120e4257a 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Izena"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "karpeta bat"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} karpeta"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "fitxategi bat"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} fitxategi"
 
diff --git a/l10n/eu/files_versions.po b/l10n/eu/files_versions.po
index 64844cd7adf..fdece04b8c3 100644
--- a/l10n/eu/files_versions.po
+++ b/l10n/eu/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Historia"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Fitxategien Bertsioak"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 7b268d3a9d6..b605292a8ae 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -25,6 +25,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Ezin izan da App Dendatik zerrenda kargatu"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Autentifikazio errorea"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Taldea dagoeneko existitzenda"
@@ -49,10 +58,6 @@ msgstr "Baliogabeko eposta"
 msgid "Unable to delete group"
 msgstr "Ezin izan da taldea ezabatu"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Autentifikazio errorea"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Ezin izan da erabiltzailea ezabatu"
@@ -115,7 +120,7 @@ msgstr "Errorea"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Gordetzen..."
 
@@ -192,67 +197,83 @@ msgstr "Deskargatu Android bezeroa"
 msgid "Download iOS Client"
 msgstr "Deskargatu iOS bezeroa"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Pasahitza"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Zere pasahitza aldatu da"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Ezin izan da zure pasahitza aldatu"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Uneko pasahitza"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Pasahitz berria"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "erakutsi"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Aldatu pasahitza"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Bistaratze Izena"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "E-Posta"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Zure e-posta"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Hizkuntza"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Lagundu itzultzen"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera konektatzeko"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Bertsioa"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -286,10 +307,6 @@ msgstr "Mugarik gabe"
 msgid "Other"
 msgstr "Besteak"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr "Bistaratze Izena"
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Talde administradorea"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index f55cb063518..5e0f44fe88b 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -215,8 +215,8 @@ msgid "Use TLS"
 msgstr "Erabili TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Ez erabili SSL konexioetan, huts egingo du."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 7ac12d0c3a7..de2bbcd7005 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 14:04+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,8 +52,9 @@ msgid "No category to add?"
 msgstr "آیا گروه دیگری برای افزودن ندارید"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "این گروه از قبل اضافه شده"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -157,59 +158,59 @@ msgstr "نوامبر"
 msgid "December"
 msgstr "دسامبر"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "ثانیه‌ها پیش"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 دقیقه پیش"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{دقیقه ها} دقیقه های پیش"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "1 ساعت پیش"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{ساعت ها} ساعت ها پیش"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "امروز"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "دیروز"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{روزها} روزهای پیش"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "ماه قبل"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{ماه ها} ماه ها پیش"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "ماه‌های قبل"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "سال قبل"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "سال‌های قبل"
 
@@ -468,7 +469,7 @@ msgstr "ویرایش گروه ها"
 msgid "Add"
 msgstr "افزودن"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "اخطار امنیتی"
 
@@ -478,71 +479,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "هیچ مولد تصادفی امن در دسترس نیست، لطفا فرمت PHP OpenSSL را فعال نمایید."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "بدون وجود یک تولید کننده اعداد تصادفی امن ، یک مهاجم ممکن است این قابلیت را داشته باشد که پیشگویی کند پسوورد های راه انداز گرفته شده و کنترلی روی حساب کاربری شما داشته باشد ."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "لطفا یک <strong> شناسه برای مدیر</strong> بسازید"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "حرفه ای"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "پوشه اطلاعاتی"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "پایگاه داده برنامه ریزی شدند"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "استفاده خواهد شد"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "شناسه پایگاه داده"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "پسورد پایگاه داده"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "نام پایگاه داده"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "جدول پایگاه داده"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "هاست پایگاه داده"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "اتمام نصب"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "سرویس وب تحت کنترل شما"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "خروج"
 
@@ -564,14 +569,18 @@ msgstr "لطفا رمز عبور خود را تغییر دهید تا مجددا
 msgid "Lost your password?"
 msgstr "آیا گذرواژه تان را به یاد نمی آورید؟"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "بیاد آوری"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "ورود"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "بازگشت"
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index c0c54f59a62..d18c250ecf5 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 11:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -21,46 +21,60 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "هیچ فایلی آپلود نشد.خطای ناشناس"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "هیچ خطایی وجود ندارد فایل با موفقیت بار گذاری شد"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "پرونده آپلود شده بیش ازدستور  ماکزیمم_حجم فایل_برای آپلود در   php.ini استفاده کرده است."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "حداکثر حجم مجاز برای بارگذاری از طریق HTML \nMAX_FILE_SIZE"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "مقدار کمی از فایل بارگذاری شده"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "هیچ فایلی بارگذاری نشده"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "یک پوشه موقت گم شده است"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "نوشتن بر روی دیسک سخت ناموفق بود"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "فضای کافی در دسترس نیست"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "فهرست راهنما نامعتبر می باشد."
 
@@ -72,11 +86,15 @@ msgstr "فایل ها"
 msgid "Unshare"
 msgstr "لغو اشتراک"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "پاک کردن"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "تغییرنام"
 
@@ -181,31 +199,31 @@ msgstr "URL  نمی تواند خالی باشد."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "نام پوشه نامعتبر است. استفاده از \" به اشتراک گذاشته شده \" متعلق به سایت Owncloud است."
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "نام"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "اندازه"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "تغییر یافته"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 پوشه"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{ شمار} پوشه ها"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 پرونده"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{ شمار } فایل ها"
 
diff --git a/l10n/fa/files_trashbin.po b/l10n/fa/files_trashbin.po
index d0801cffe9f..a9bffbf81b1 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-02-04 00:05+0100\n"
-"PO-Revision-Date: 2013-02-03 12:40+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "نام"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 پوشه"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{ شمار} پوشه ها"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 پرونده"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{ شمار } فایل ها"
 
diff --git a/l10n/fa/files_versions.po b/l10n/fa/files_versions.po
index 276a3e16135..a2a96bc6ec1 100644
--- a/l10n/fa/files_versions.po
+++ b/l10n/fa/files_versions.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-04 00:05+0100\n"
-"PO-Revision-Date: 2013-02-03 11:40+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,45 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "تاریخچه"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index bc13d018d0b..f38f77bf14e 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 13:30+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,6 +26,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "قادر به بارگذاری لیست از فروشگاه اپ نیستم"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "خطا در اعتبار سنجی"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "این گروه در حال حاضر موجود است"
@@ -50,10 +59,6 @@ msgstr "ایمیل غیر قابل قبول"
 msgid "Unable to delete group"
 msgstr "حذف گروه امکان پذیر نیست"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "خطا در اعتبار سنجی"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "حذف کاربر امکان پذیر نیست"
@@ -116,7 +121,7 @@ msgstr "خطا"
 msgid "Updated"
 msgstr "بروز رسانی انجام شد"
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "درحال ذخیره ..."
 
@@ -221,39 +226,55 @@ msgstr "نمایش"
 msgid "Change password"
 msgstr "تغییر گذر واژه"
 
-#: templates/personal.php:38
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "پست الکترونیکی"
 
-#: templates/personal.php:39
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "پست الکترونیکی شما"
 
-#: templates/personal.php:40
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "پست الکترونیکی را پرکنید  تا بازیابی گذرواژه فعال شود"
 
-#: templates/personal.php:46 templates/personal.php:47
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "زبان"
 
-#: templates/personal.php:52
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "به ترجمه آن کمک کنید"
 
-#: templates/personal.php:57
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:85
 msgid "Version"
 msgstr "نسخه"
 
-#: templates/personal.php:70
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -287,10 +308,6 @@ msgstr "نامحدود"
 msgid "Other"
 msgstr "سایر"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index 2ec49d42b23..4297459853f 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 05:40+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -215,7 +215,7 @@ msgid "Use TLS"
 msgstr ""
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
 #: templates/settings.php:39
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 34672cc2cb0..fef4938627f 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,8 +57,9 @@ msgid "No category to add?"
 msgstr "Ei lisättävää luokkaa?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Tämä luokka on jo olemassa: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -162,59 +163,59 @@ msgstr "Marraskuu"
 msgid "December"
 msgstr "Joulukuu"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Asetukset"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "sekuntia sitten"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 minuutti sitten"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuuttia sitten"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "1 tunti sitten"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{hours} tuntia sitten"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "tänään"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "eilen"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} päivää sitten"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "viime kuussa"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{months} kuukautta sitten"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "kuukautta sitten"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "viime vuonna"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "vuotta sitten"
 
@@ -473,7 +474,7 @@ msgstr "Muokkaa luokkia"
 msgid "Add"
 msgstr "Lisää"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Turvallisuusvaroitus"
 
@@ -483,71 +484,75 @@ msgid ""
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr ""
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Data-kansio ja tiedostot ovat ehkä saavutettavissa Internetistä. .htaccess-tiedosto, jolla kontrolloidaan pääsyä, ei toimi. Suosittelemme, että muutat web-palvelimesi asetukset niin ettei data-kansio ole enää pääsyä tai siirrät data-kansion pois web-palvelimen tiedostojen juuresta."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Luo <strong>ylläpitäjän tunnus</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Datakansio"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Muokkaa tietokantaa"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "käytetään"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Tietokannan käyttäjä"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Tietokannan salasana"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Tietokannan nimi"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Tietokannan taulukkotila"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Tietokantapalvelin"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Viimeistele asennus"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "verkkopalvelut hallinnassasi"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Kirjaudu ulos"
 
@@ -569,14 +574,18 @@ msgstr "Vaihda salasanasi suojataksesi tilisi uudelleen."
 msgid "Lost your password?"
 msgstr "Unohditko salasanasi?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "muista"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Kirjaudu sisään"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "edellinen"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 3e3ea718bb0..57096ee2349 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 13:58+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,46 +22,60 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Tiedostoa ei lähetetty. Tuntematon virhe"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Ei virheitä, tiedosto lähetettiin onnistuneesti"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Lähetetty tiedosto ylittää HTML-lomakkeessa määritetyn MAX_FILE_SIZE-arvon ylärajan"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Tiedoston lähetys onnistui vain osittain"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Yhtäkään tiedostoa ei lähetetty"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Väliaikaiskansiota ei ole olemassa"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Levylle kirjoitus epäonnistui"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Tilaa ei ole riittävästi"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Virheellinen kansio."
 
@@ -73,11 +87,15 @@ msgstr "Tiedostot"
 msgid "Unshare"
 msgstr "Peru jakaminen"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Poista"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
@@ -182,31 +200,31 @@ msgstr "Verkko-osoite ei voi olla tyhjä"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Koko"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Muutettu"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 kansio"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} kansiota"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 tiedosto"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} tiedostoa"
 
diff --git a/l10n/fi_FI/files_trashbin.po b/l10n/fi_FI/files_trashbin.po
index 3543c5b1193..27afca0a85b 100644
--- a/l10n/fi_FI/files_trashbin.po
+++ b/l10n/fi_FI/files_trashbin.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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,31 +18,45 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr "suorita palautustoiminto"
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Nimi"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr "Poistettu"
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 kansio"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} kansiota"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 tiedosto"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} tiedostoa"
 
diff --git a/l10n/fi_FI/files_versions.po b/l10n/fi_FI/files_versions.po
index 4a04a540a90..f8ce72e1e07 100644
--- a/l10n/fi_FI/files_versions.po
+++ b/l10n/fi_FI/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Historia"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Tiedostojen versiointi"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index eb214d66683..f31845d910b 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 13:58+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,6 +24,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Ei pystytä lataamaan listaa sovellusvarastosta (App Store)"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Todennusvirhe"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Ryhmä on jo olemassa"
@@ -48,10 +57,6 @@ msgstr "Virheellinen sähköposti"
 msgid "Unable to delete group"
 msgstr "Ryhmän poisto epäonnistui"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Todennusvirhe"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Käyttäjän poisto epäonnistui"
@@ -114,7 +119,7 @@ msgstr "Virhe"
 msgid "Updated"
 msgstr "Päivitetty"
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Tallennetaan..."
 
@@ -191,67 +196,83 @@ msgstr "Lataa Android-sovellus"
 msgid "Download iOS Client"
 msgstr "Lataa iOS-sovellus"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Salasana"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Salasanasi vaihdettiin"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Salasanaasi ei voitu vaihtaa"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Nykyinen salasana"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "näytä"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Vaihda salasana"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Näyttönimi"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Sähköposti"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Sähköpostiosoitteesi"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Kieli"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Auta kääntämisessä"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Käytä tätä osoitetta yhdistäessäsi ownCloudiisi tiedostonhallintaa käyttäen"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Versio"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -285,10 +306,6 @@ msgstr "Rajoittamaton"
 msgid "Other"
 msgstr "Muu"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr "Näyttönimi"
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Ryhmän ylläpitäjä"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index e0a1ecc049e..14247957dd3 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -216,8 +216,8 @@ msgid "Use TLS"
 msgstr "Käytä TLS:ää"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Älä käytä SSL-yhteyttä varten, se epäonnistuu. "
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index ca18cbb340c..1454975ea7f 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -15,14 +15,14 @@
 #   <nathaplop@gmail.com>, 2012.
 #   <nicolas@shivaserv.fr>, 2012.
 #   <rom1dep@gmail.com>, 2011.
-# Romain DEP. <rom1dep@gmail.com>, 2012.
+# Romain DEP. <rom1dep@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 14:30+0000\n"
-"Last-Translator: ptit_boogy <ptit.boogy@gmail.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,8 +63,9 @@ msgid "No category to add?"
 msgstr "Pas de catégorie à ajouter ?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Cette catégorie existe déjà : "
+#, php-format
+msgid "This category already exists: %s"
+msgstr "Cette catégorie existe déjà : %s"
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -168,59 +169,59 @@ msgstr "novembre"
 msgid "December"
 msgstr "décembre"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Paramètres"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "il y a quelques secondes"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "il y a une minute"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "il y a {minutes} minutes"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "Il y a une heure"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "Il y a {hours} heures"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "aujourd'hui"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "hier"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "il y a {days} jours"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "le mois dernier"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "Il y a {months} mois"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "il y a plusieurs mois"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "l'année dernière"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "il y a plusieurs années"
 
@@ -479,7 +480,7 @@ msgstr "Modifier les catégories"
 msgid "Add"
 msgstr "Ajouter"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Avertissement de sécurité"
 
@@ -489,71 +490,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Aucun générateur de nombre aléatoire sécurisé n'est disponible, veuillez activer l'extension PHP OpenSSL"
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Sans générateur de nombre aléatoire sécurisé, un attaquant peut être en mesure de prédire les jetons de réinitialisation du mot de passe, et ainsi prendre le contrôle de votre compte utilisateur."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Votre dossier data et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess fourni par ownCloud ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de manière à ce que le dossier data ne soit plus accessible ou bien de déplacer le dossier data en dehors du dossier racine des documents du serveur web."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Créer un <strong>compte administrateur</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Avancé"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Répertoire des données"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Configurer la base de données"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "sera utilisé"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Utilisateur pour la base de données"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Mot de passe de la base de données"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Nom de la base de données"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Tablespaces de la base de données"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Serveur de la base de données"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Terminer l'installation"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "services web sous votre contrôle"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Se déconnecter"
 
@@ -575,14 +580,18 @@ msgstr "Veuillez changer votre mot de passe pour sécuriser à nouveau votre com
 msgid "Lost your password?"
 msgstr "Mot de passe perdu ?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "se souvenir de moi"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Connexion"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr "Logins alternatifs"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "précédent"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 5a5f892a67e..0e732da55ae 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -21,9 +21,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 14:30+0000\n"
-"Last-Translator: Flywall <sid50.martin@gmail.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,46 +31,60 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Aucun fichier n'a été chargé. Erreur inconnue"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Aucune erreur, le fichier a été téléversé avec succès"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Le fichier envoyé dépasse la valeur upload_max_filesize située dans le fichier php.ini:"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Le fichier téléversé excède la valeur de MAX_FILE_SIZE spécifiée dans le formulaire HTML"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Le fichier n'a été que partiellement téléversé"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Aucun fichier n'a été téléversé"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Il manque un répertoire temporaire"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Erreur d'écriture sur le disque"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Espace disponible insuffisant"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Dossier invalide."
 
@@ -82,11 +96,15 @@ msgstr "Fichiers"
 msgid "Unshare"
 msgstr "Ne plus partager"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr "Supprimer de façon définitive"
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Supprimer"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Renommer"
 
@@ -191,31 +209,31 @@ msgstr "L'URL ne peut-être vide"
 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:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Taille"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Modifié"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 dossier"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} dossiers"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 fichier"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} fichiers"
 
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
index d20576ced12..ac5a41de001 100644
--- a/l10n/fr/files_encryption.po
+++ b/l10n/fr/files_encryption.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-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 14:02+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@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"
@@ -46,15 +46,15 @@ msgstr "Chiffrement"
 
 #: templates/settings-personal.php:7
 msgid "File encryption is enabled."
-msgstr ""
+msgstr "Le chiffrement des fichiers est activé"
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "Les fichiers de types suivants ne seront pas chiffrés :"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "Ne pas chiffrer les fichiers dont les types sont les suivants :"
 
 #: templates/settings.php:12
 msgid "None"
diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po
index d8a8b2c7926..23b922f8f1c 100644
--- a/l10n/fr/files_trashbin.po
+++ b/l10n/fr/files_trashbin.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 14:03+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@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"
@@ -19,31 +19,45 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr "Impossible d'effacer %s de façon permanente"
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr "Impossible de restaurer %s"
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr "effectuer l'opération de restauration"
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr "effacer définitivement le fichier"
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Nom"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr "Effacé"
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 dossier"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} dossiers"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 fichier"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} fichiers"
 
diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po
index 1fb4fdb1de2..0bfce6ee9bc 100644
--- a/l10n/fr/files_versions.po
+++ b/l10n/fr/files_versions.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Romain DEP. <rom1dep@gmail.com>, 2012.
+# Romain DEP. <rom1dep@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 14:02+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@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"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr "Impossible de restaurer %s"
+
+#: history.php:40
+msgid "success"
+msgstr "succès"
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr "Le fichier %s a été restauré dans sa version %s"
+
+#: history.php:49
+msgid "failure"
+msgstr "échec"
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr "Le fichier %s ne peut être restauré dans sa version %s"
+
+#: history.php:68
+msgid "No old versions available"
+msgstr "Aucune ancienne version n'est disponible"
+
+#: history.php:73
+msgid "No path specified"
+msgstr "Aucun chemin spécifié"
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Historique"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr "Restaurez un fichier dans une version antérieure en cliquant sur son bouton de restauration"
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Versionnage des fichiers"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 59ec0fc34ac..edf75b638a0 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -24,9 +24,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 20:10+0000\n"
-"Last-Translator: jiminybillybob <thomash76@gmail.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 14:01+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@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"
@@ -38,6 +38,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Impossible de charger la liste depuis l'App Store"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Erreur d'authentification"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr "Impossible de modifier le nom d'affichage"
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Ce groupe existe déjà"
@@ -62,10 +71,6 @@ msgstr "E-mail invalide"
 msgid "Unable to delete group"
 msgstr "Impossible de supprimer le groupe"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Erreur d'authentification"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Impossible de supprimer l'utilisateur"
@@ -128,7 +133,7 @@ msgstr "Erreur"
 msgid "Updated"
 msgstr "Mise à jour effectuée avec succès"
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Sauvegarde..."
 
@@ -233,39 +238,55 @@ msgstr "Afficher"
 msgid "Change password"
 msgstr "Changer de mot de passe"
 
-#: templates/personal.php:38
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Nom affiché"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr "Votre nom d'affichage a bien été modifié"
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr "Impossible de modifier votre nom d'affichage"
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr "Changer le nom affiché"
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:39
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Votre adresse e-mail"
 
-#: templates/personal.php:40
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Entrez votre adresse e-mail pour permettre la réinitialisation du mot de passe"
 
-#: templates/personal.php:46 templates/personal.php:47
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Langue"
 
-#: templates/personal.php:52
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Aidez à traduire"
 
-#: templates/personal.php:57
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:59
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Utiliser cette adresse pour vous connecter à ownCloud dans votre gestionnaire de fichiers"
 
-#: templates/personal.php:68
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Version"
 
-#: templates/personal.php:70
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -299,10 +320,6 @@ msgstr "Illimité"
 msgid "Other"
 msgstr "Autre"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr "Nom affiché"
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Groupe Admin"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index acc3b57fd72..61d51d61cab 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 20:10+0000\n"
-"Last-Translator: jiminybillybob <thomash76@gmail.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 14:02+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@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"
@@ -220,8 +220,8 @@ msgid "Use TLS"
 msgstr "Utiliser TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Ne pas utiliser pour les connexions SSL, car cela échouera."
+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:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 227dd8bf060..6c9cc0dfe4e 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -53,8 +53,9 @@ msgid "No category to add?"
 msgstr "Sen categoría que engadir?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Esta categoría xa existe: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -158,59 +159,59 @@ msgstr "novembro"
 msgid "December"
 msgstr "decembro"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Configuracións"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "hai 1 minuto"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "hai {minutes} minutos"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "hai 1 hora"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "hai {hours} horas"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "hoxe"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "onte"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "hai {days} días"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "último mes"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "hai {months} meses"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "último ano"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "anos atrás"
 
@@ -469,7 +470,7 @@ msgstr "Editar categorías"
 msgid "Add"
 msgstr "Engadir"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Aviso de seguranza"
 
@@ -479,71 +480,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Non hai un xerador de números ao chou dispoñíbel. Active o engadido de OpenSSL para PHP."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Sen un xerador seguro de números ao chou podería acontecer que predicindo as cadeas de texto de reinicio de contrasinais se afagan coa súa conta."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "O seu cartafol de datos e os seus ficheiros probabelmente sexan accesíbeis a través da Internet. O ficheiro .htaccess que fornece ownCloud non está a empregarse. Suxerimoslle que configure o seu servidor web de tal xeito que o cartafol de datos non estea accesíbel ou mova o cartafol de datos fora do directorio raíz de datos do servidor web."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear unha <strong>contra de administrador</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Cartafol de datos"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Configurar a base de datos"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "vai ser utilizado"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Usuario da base de datos"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Contrasinal da base de datos"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Nome da base de datos"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Táboa de espazos da base de datos"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Servidor da base de datos"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Rematar a configuración"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "servizos web baixo o seu control"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Desconectar"
 
@@ -565,14 +570,18 @@ msgstr "Cambie de novo o seu contrasinal para asegurar a súa conta."
 msgid "Lost your password?"
 msgstr "Perdeu o contrasinal?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "lembrar"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Conectar"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "anterior"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 020232e7f37..928faa768b9 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.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-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -19,46 +19,60 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Non se subiu ningún ficheiro. Erro descoñecido."
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Non hai erros. O ficheiro enviouse correctamente"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "O ficheiro subido excede a directiva indicada polo tamaño_máximo_de_subida de php.ini"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "O ficheiro enviado supera a directiva MAX_FILE_SIZE que foi indicada no formulario HTML"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "O ficheiro enviado foi só parcialmente enviado"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Non se enviou ningún ficheiro"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Falta un cartafol temporal"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Erro ao escribir no disco"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "O espazo dispoñíbel é insuficiente"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "O directorio é incorrecto."
 
@@ -70,11 +84,15 @@ msgstr "Ficheiros"
 msgid "Unshare"
 msgstr "Deixar de compartir"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Eliminar"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Mudar o nome"
 
@@ -179,31 +197,31 @@ msgstr "URL non pode quedar baleiro."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nome de cartafol non válido. O uso de 'Shared' está reservado por Owncloud"
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 cartafol"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} cartafoles"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} ficheiros"
 
diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po
index be7e4127d3a..9e9dd72adb0 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -17,31 +17,45 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Nome"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 cartafol"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} cartafoles"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} ficheiros"
 
diff --git a/l10n/gl/files_versions.po b/l10n/gl/files_versions.po
index c0ac98462b7..7bfd504e633 100644
--- a/l10n/gl/files_versions.po
+++ b/l10n/gl/files_versions.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -20,10 +20,45 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Historial"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Sistema de versión de ficheiros"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index ccfa410e29f..ca408e99943 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -24,6 +24,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Non foi posíbel cargar a lista desde a App Store"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Produciuse un erro de autenticación"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "O grupo xa existe"
@@ -48,10 +57,6 @@ msgstr "correo incorrecto"
 msgid "Unable to delete group"
 msgstr "Non é posíbel eliminar o grupo."
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Produciuse un erro de autenticación"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Non é posíbel eliminar o usuario"
@@ -114,7 +119,7 @@ msgstr "Erro"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Gardando..."
 
@@ -191,67 +196,83 @@ msgstr "Descargar clientes para Android"
 msgid "Download iOS Client"
 msgstr "Descargar clientes ra iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Contrasinal"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "O seu contrasinal foi cambiado"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Non é posíbel cambiar o seu contrasinal"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Contrasinal actual"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Novo contrasinal"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "amosar"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Cambiar o contrasinal"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Correo"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "O seu enderezo de correo"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Escriba un enderezo de correo para activar a recuperación do contrasinal"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Axude na tradución"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Utilice este enderezo para conectarse ao seu ownCloud co administrador de ficheiros"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Versión"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -285,10 +306,6 @@ msgstr "Sen límites"
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grupo Admin"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index fe74411b941..72ec0caf49a 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -215,8 +215,8 @@ msgid "Use TLS"
 msgstr "Usar TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Non empregalo para conexións SSL: fallará."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 8a781cb282f..63923beacfc 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -55,8 +55,9 @@ msgid "No category to add?"
 msgstr "אין קטגוריה להוספה?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "קטגוריה זאת כבר קיימת: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -160,59 +161,59 @@ msgstr "נובמבר"
 msgid "December"
 msgstr "דצמבר"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "הגדרות"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "שניות"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "לפני דקה אחת"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "לפני {minutes} דקות"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "לפני שעה"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "לפני {hours} שעות"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "היום"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "אתמול"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "לפני {days} ימים"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "חודש שעבר"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "לפני {months} חודשים"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "חודשים"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "שנה שעברה"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "שנים"
 
@@ -471,7 +472,7 @@ msgstr "עריכת הקטגוריות"
 msgid "Add"
 msgstr "הוספה"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "אזהרת אבטחה"
 
@@ -481,71 +482,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "אין מחולל מספרים אקראיים מאובטח, נא להפעיל את ההרחבה OpenSSL ב־PHP."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "ללא מחולל מספרים אקראיים מאובטח תוקף יכול לנבא את מחרוזות איפוס הססמה ולהשתלט על החשבון שלך."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "יתכן שתיקיית הנתונים והקבצים שלך נגישים דרך האינטרנט. קובץ ה־‎.htaccess שמסופק על ידי ownCloud כנראה אינו עובד. אנו ממליצים בחום להגדיר את שרת האינטרנט שלך בדרך שבה תיקיית הנתונים לא תהיה זמינה עוד או להעביר את תיקיית הנתונים מחוץ לספריית העל של שרת האינטרנט."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "יצירת <strong>חשבון מנהל</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "מתקדם"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "תיקיית נתונים"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "הגדרת מסד הנתונים"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "ינוצלו"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "שם משתמש במסד הנתונים"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "ססמת מסד הנתונים"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "שם מסד הנתונים"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "מרחב הכתובות של מסד הנתונים"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "שרת בסיס נתונים"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "סיום התקנה"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "שירותי רשת בשליטתך"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "התנתקות"
 
@@ -567,14 +572,18 @@ msgstr "נא לשנות את הססמה שלך כדי לאבטח את חשבונ
 msgid "Lost your password?"
 msgstr "שכחת את ססמתך?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "שמירת הססמה"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "כניסה"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "הקודם"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index ed74dc9066f..97499d15ec7 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -21,46 +21,60 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "לא הועלה קובץ. טעות בלתי מזוהה."
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "לא אירעה תקלה, הקבצים הועלו בהצלחה"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "הקבצים שנשלחו חורגים מהגודל שצוין בהגדרה upload_max_filesize שבקובץ php.ini:"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "הקובץ שהועלה חרג מההנחיה MAX_FILE_SIZE שצוינה בטופס ה־HTML"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "הקובץ שהועלה הועלה בצורה חלקית"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "לא הועלו קבצים"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "תיקייה זמנית חסרה"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "הכתיבה לכונן נכשלה"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -72,11 +86,15 @@ msgstr "קבצים"
 msgid "Unshare"
 msgstr "הסר שיתוף"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "מחיקה"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "שינוי שם"
 
@@ -181,31 +199,31 @@ msgstr "קישור אינו יכול להיות ריק."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "שם"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "גודל"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "זמן שינוי"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "תיקייה אחת"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} תיקיות"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "קובץ אחד"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} קבצים"
 
diff --git a/l10n/he/files_trashbin.po b/l10n/he/files_trashbin.po
index e2f9372e88e..4291039ce16 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -17,31 +17,45 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "שם"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "תיקייה אחת"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} תיקיות"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "קובץ אחד"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} קבצים"
 
diff --git a/l10n/he/files_versions.po b/l10n/he/files_versions.po
index 15bb3e971b3..4d1caaf1149 100644
--- a/l10n/he/files_versions.po
+++ b/l10n/he/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -19,10 +19,45 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "היסטוריה"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "שמירת הבדלי גרסאות של קבצים"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index cceb07b9d17..018aebd9f60 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -25,6 +25,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "לא ניתן לטעון רשימה מה־App Store"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "שגיאת הזדהות"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "הקבוצה כבר קיימת"
@@ -49,10 +58,6 @@ msgstr "דוא״ל לא חוקי"
 msgid "Unable to delete group"
 msgstr "לא ניתן למחוק את הקבוצה"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "שגיאת הזדהות"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "לא ניתן למחוק את המשתמש"
@@ -115,7 +120,7 @@ msgstr "שגיאה"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "שומר.."
 
@@ -192,67 +197,83 @@ msgstr "הורד תוכנה לאנדרואיד"
 msgid "Download iOS Client"
 msgstr "הורד תוכנה לiOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "ססמה"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "הססמה שלך הוחלפה"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "לא ניתן לשנות את הססמה שלך"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "ססמה נוכחית"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "ססמה חדשה"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "הצגה"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "שינוי ססמה"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "דוא״ל"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "כתובת הדוא״ל שלך"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "נא למלא את כתובת הדוא״ל שלך כדי לאפשר שחזור ססמה"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "פה"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "עזרה בתרגום"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "השתמש בכתובת זאת על מנת להתחבר אל ownCloud דרך סייר קבצים."
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "גרסא"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -286,10 +307,6 @@ msgstr ""
 msgid "Other"
 msgstr "אחר"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "מנהל הקבוצה"
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index 54ede62468b..cd67250d867 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -214,7 +214,7 @@ msgid "Use TLS"
 msgstr ""
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
 #: templates/settings.php:39
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index 3e666c18c78..4706ee1f2cd 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/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-01-30 00:23+0100\n"
-"PO-Revision-Date: 2013-01-29 23:23+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -52,7 +52,8 @@ msgid "No category to add?"
 msgstr ""
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
+#, php-format
+msgid "This category already exists: %s"
 msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
@@ -157,59 +158,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
+#: js/js.js:284
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:762
+#: js/js.js:764
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:763
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:765
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:766
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:769
 msgid "today"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:770
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:772
 msgid "last month"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:774
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:773
+#: js/js.js:775
 msgid "last year"
 msgstr ""
 
-#: js/js.js:774
+#: js/js.js:776
 msgid "years ago"
 msgstr ""
 
@@ -468,7 +469,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr ""
 
@@ -478,71 +479,75 @@ msgid ""
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr ""
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "व्यवस्थापक खाता बनाएँ"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "उन्नत"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "डेटाबेस कॉन्फ़िगर करें "
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "डेटाबेस उपयोगकर्ता"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "डेटाबेस पासवर्ड"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "सेटअप समाप्त करे"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:32
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr ""
 
@@ -564,14 +569,18 @@ msgstr ""
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr ""
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "पिछला"
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index c56da3dc54c..1bffd04a963 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-01-31 17:02+0100\n"
-"PO-Revision-Date: 2013-01-31 16:02+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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,46 +17,60 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -68,11 +82,15 @@ msgstr ""
 msgid "Unshare"
 msgstr ""
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr ""
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr ""
 
@@ -177,31 +195,31 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/hi/files_trashbin.po b/l10n/hi/files_trashbin.po
index ecec4c0cae6..a0b6e4cede0 100644
--- a/l10n/hi/files_trashbin.po
+++ b/l10n/hi/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/hi/files_versions.po b/l10n/hi/files_versions.po
index 293e4b558a7..65790b4d6ba 100644
--- a/l10n/hi/files_versions.po
+++ b/l10n/hi/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,10 +17,45 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index 58343582a26..b0e88f95c9b 100644
--- a/l10n/hi/settings.po
+++ b/l10n/hi/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -21,6 +21,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr ""
@@ -45,10 +54,6 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr ""
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr ""
@@ -111,7 +116,7 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr ""
 
@@ -188,67 +193,83 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "पासवर्ड"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "नया पासवर्ड"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr ""
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -282,10 +303,6 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index 7eb23a9a108..b37e24b8292 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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -213,7 +213,7 @@ msgid "Use TLS"
 msgstr ""
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
 #: templates/settings.php:39
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 30f2d56afb1..ebbeae5639d 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -54,8 +54,9 @@ msgid "No category to add?"
 msgstr "Nemate kategorija koje možete dodati?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Ova kategorija već postoji: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -159,59 +160,59 @@ msgstr "Studeni"
 msgid "December"
 msgstr "Prosinac"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Postavke"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "sekundi prije"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "danas"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "jučer"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "prošli mjesec"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "mjeseci"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "prošlu godinu"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "godina"
 
@@ -470,7 +471,7 @@ msgstr "Uredi kategorije"
 msgid "Add"
 msgstr "Dodaj"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr ""
 
@@ -480,71 +481,75 @@ msgid ""
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr ""
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Stvori <strong>administratorski račun</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Dodatno"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Mapa baze podataka"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Konfiguriraj bazu podataka"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "će se koristiti"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Korisnik baze podataka"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Lozinka baze podataka"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Ime baze podataka"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Database tablespace"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Poslužitelj baze podataka"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Završi postavljanje"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "web usluge pod vašom kontrolom"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Odjava"
 
@@ -566,14 +571,18 @@ msgstr ""
 msgid "Lost your password?"
 msgstr "Izgubili ste lozinku?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "zapamtiti"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Prijava"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "prethodan"
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index 7a03f6b1977..54726b33311 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -20,46 +20,60 @@ 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/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Datoteka je poslana uspješno i bez pogrešaka"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Poslana datoteka izlazi iz okvira MAX_FILE_SIZE direktive postavljene u HTML obrascu"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Datoteka je poslana samo djelomično"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Ni jedna datoteka nije poslana"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Nedostaje privremena mapa"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Neuspjelo pisanje na disk"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -71,11 +85,15 @@ msgstr "Datoteke"
 msgid "Unshare"
 msgstr "Prekini djeljenje"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Briši"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Promjeni ime"
 
@@ -180,31 +198,31 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Naziv"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Zadnja promjena"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/hr/files_trashbin.po b/l10n/hr/files_trashbin.po
index 0665783c041..a5e90a28bb2 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ 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"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Ime"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/hr/files_versions.po b/l10n/hr/files_versions.po
index 0425c2dc568..a1fb9209e3b 100644
--- a/l10n/hr/files_versions.po
+++ b/l10n/hr/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,10 +17,45 @@ 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/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index af697fb7817..062d280811c 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -24,6 +24,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Nemogićnost učitavanja liste sa Apps Stora"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Greška kod autorizacije"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr ""
@@ -48,10 +57,6 @@ msgstr "Neispravan email"
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Greška kod autorizacije"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr ""
@@ -114,7 +119,7 @@ msgstr "Greška"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Spremanje..."
 
@@ -191,67 +196,83 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Nemoguće promijeniti lozinku"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Trenutna lozinka"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Nova lozinka"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "prikaz"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Izmjena lozinke"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "e-mail adresa"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Vaša e-mail adresa"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ispunite vase e-mail adresa kako bi se omogućilo oporavak lozinke"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Pomoć prevesti"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -285,10 +306,6 @@ msgstr ""
 msgid "Other"
 msgstr "ostali"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grupa Admin"
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index f1c4515d4d2..eb75fed54a8 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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -213,7 +213,7 @@ msgid "Use TLS"
 msgstr ""
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
 #: templates/settings.php:39
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index a30b6c37d61..9cd13d6adf5 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -55,8 +55,9 @@ msgid "No category to add?"
 msgstr "Nincs hozzáadandó kategória?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Ez a kategória már létezik: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -160,59 +161,59 @@ msgstr "november"
 msgid "December"
 msgstr "december"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Beállítások"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "pár másodperce"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 perce"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} perce"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "1 órája"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{hours} órája"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "ma"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "tegnap"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} napja"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "múlt hónapban"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{months} hónapja"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "több hónapja"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "tavaly"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "több éve"
 
@@ -471,7 +472,7 @@ msgstr "Kategóriák szerkesztése"
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Biztonsági figyelmeztetés"
 
@@ -481,71 +482,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Nem érhető el megfelelő véletlenszám-generátor, telepíteni kellene a PHP OpenSSL kiegészítését."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Megfelelő véletlenszám-generátor hiányában egy támadó szándékú idegen képes lehet megjósolni a jelszóvisszaállító tokent, és Ön helyett belépni."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Az adatkönytára és az itt levő fájlok valószínűleg elérhetők az internetről. Az ownCloud által beillesztett .htaccess fájl nem működik. Nagyon fontos, hogy a webszervert úgy konfigurálja, hogy az adatkönyvtár nem legyen közvetlenül kívülről elérhető, vagy az adatkönyvtárt tegye a webszerver dokumentumfáján kívülre."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Rendszergazdai belépés</strong> létrehozása"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Haladó"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Adatkönyvtár"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Adatbázis konfigurálása"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "adatbázist fogunk használni"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Adatbázis felhasználónév"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Adatbázis jelszó"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Az adatbázis neve"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Az adatbázis táblázattér (tablespace)"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Adatbázis szerver"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "A beállítások befejezése"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "webszolgáltatások saját kézben"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Kilépés"
 
@@ -567,14 +572,18 @@ msgstr "A biztonsága érdekében változtassa meg a jelszavát!"
 msgid "Lost your password?"
 msgstr "Elfelejtette a jelszavát?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "emlékezzen"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Bejelentkezés"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "előző"
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index 595e4cd8217..3b40ac770e6 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -24,46 +24,60 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Nem történt feltöltés. Ismeretlen hiba"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "A fájlt sikerült feltölteni"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "A feltöltött fájl mérete meghaladja a php.ini állományban megadott upload_max_filesize paraméter értékét."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "A feltöltött fájl mérete meghaladja a MAX_FILE_SIZE paramétert, ami a HTML  formban került megadásra."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Az eredeti fájlt csak részben sikerült feltölteni."
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Nem töltődött fel semmi"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Hiányzik egy ideiglenes mappa"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Nem sikerült a lemezre történő írás"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Nincs elég szabad hely"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Érvénytelen mappa."
 
@@ -75,11 +89,15 @@ msgstr "Fájlok"
 msgid "Unshare"
 msgstr "Megosztás visszavonása"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Törlés"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Átnevezés"
 
@@ -184,31 +202,31 @@ msgstr "Az URL nem lehet semmi."
 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:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Név"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Méret"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Módosítva"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} mappa"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 fájl"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} fájl"
 
diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po
index 5cabef3a633..0f7239c2cdc 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Név"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} mappa"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 fájl"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} fájl"
 
diff --git a/l10n/hu_HU/files_versions.po b/l10n/hu_HU/files_versions.po
index d5db4ac6033..f2b3829c7aa 100644
--- a/l10n/hu_HU/files_versions.po
+++ b/l10n/hu_HU/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,10 +17,45 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Korábbi változatok"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Az állományok verzionálása"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 4be00602dd8..d544d5d95b0 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -24,6 +24,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Nem tölthető le a lista az App Store-ból"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Azonosítási hiba"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "A csoport már létezik"
@@ -48,10 +57,6 @@ msgstr "Hibás email"
 msgid "Unable to delete group"
 msgstr "A csoport nem törölhető"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Azonosítási hiba"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "A felhasználó nem törölhető"
@@ -114,7 +119,7 @@ msgstr "Hiba"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Mentés..."
 
@@ -191,67 +196,83 @@ msgstr "Android kliens letöltése"
 msgid "Download iOS Client"
 msgstr "iOS kliens letöltése"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Jelszó"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "A jelszava megváltozott"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "A jelszó nem változtatható meg"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "A jelenlegi jelszó"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Az új jelszó"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "lássam"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "A jelszó megváltoztatása"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Az Ön email címe"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Adja meg az email címét, hogy jelszó-emlékeztetőt kérhessen, ha elfelejtette a jelszavát!"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Nyelv"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Segítsen a fordításban!"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Ennek a címnek a megadásával a WebDAV-protokollon keresztül saját gépének fájlkezelőjével is is elérheti az állományait."
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Verzió"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -285,10 +306,6 @@ msgstr "Korlátlan"
 msgid "Other"
 msgstr "Más"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Csoportadminisztrátor"
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index 83d3b7c227e..1b2cd9d4f82 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -215,8 +215,8 @@ msgid "Use TLS"
 msgstr "Használjunk TLS-t"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Ne használjuk SSL-kapcsolat esetén, mert nem fog működni!"
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 6359a737f3e..385d32959dc 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/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-01-31 17:02+0100\n"
-"PO-Revision-Date: 2013-01-30 23:40+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -51,8 +51,9 @@ msgid "No category to add?"
 msgstr ""
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Iste categoria jam existe:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -156,59 +157,59 @@ msgstr "Novembre"
 msgid "December"
 msgstr "Decembre"
 
-#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
+#: js/js.js:284
 msgid "Settings"
 msgstr "Configurationes"
 
-#: js/js.js:762
+#: js/js.js:764
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:763
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:765
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:766
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:769
 msgid "today"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:770
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:772
 msgid "last month"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:774
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:773
+#: js/js.js:775
 msgid "last year"
 msgstr ""
 
-#: js/js.js:774
+#: js/js.js:776
 msgid "years ago"
 msgstr ""
 
@@ -467,7 +468,7 @@ msgstr "Modificar categorias"
 msgid "Add"
 msgstr "Adder"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr ""
 
@@ -477,71 +478,75 @@ msgid ""
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr ""
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear un <strong>conto de administration</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Avantiate"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Dossier de datos"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Configurar le base de datos"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "essera usate"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Usator de base de datos"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Contrasigno de base de datos"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Nomine de base de datos"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Hospite de base de datos"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "servicios web sub tu controlo"
 
-#: templates/layout.user.php:32
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Clauder le session"
 
@@ -563,14 +568,18 @@ msgstr ""
 msgid "Lost your password?"
 msgstr "Tu perdeva le contrasigno?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "memora"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Aperir session"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "prev"
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 43dd321da08..1ef72be29ba 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.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-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -19,46 +19,60 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Le file incargate solmente esseva incargate partialmente"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Nulle file esseva incargate"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Manca un dossier temporari"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -70,11 +84,15 @@ msgstr "Files"
 msgid "Unshare"
 msgstr ""
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Deler"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr ""
 
@@ -179,31 +197,31 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Nomine"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Dimension"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Modificate"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/ia/files_trashbin.po b/l10n/ia/files_trashbin.po
index 3d86f721da7..a6fdefcf405 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Nomine"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/ia/files_versions.po b/l10n/ia/files_versions.po
index 7b2dbb7efe9..f3b805ad932 100644
--- a/l10n/ia/files_versions.po
+++ b/l10n/ia/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,10 +17,45 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index f465615a985..47c4885728c 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -23,6 +23,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr ""
@@ -47,10 +56,6 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr ""
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr ""
@@ -113,7 +118,7 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr ""
 
@@ -190,67 +195,83 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Contrasigno"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Non pote cambiar tu contrasigno"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Contrasigno currente"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Nove contrasigno"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "monstrar"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Cambiar contrasigno"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "E-posta"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Tu adresse de e-posta"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Linguage"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Adjuta a traducer"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -284,10 +305,6 @@ msgstr ""
 msgid "Other"
 msgstr "Altere"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index 82ab2dd2acb..4c35ec08299 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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -213,7 +213,7 @@ msgid "Use TLS"
 msgstr ""
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
 #: templates/settings.php:39
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 17776e800e2..315f226f156 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -54,8 +54,9 @@ msgid "No category to add?"
 msgstr "Tidak ada kategori yang akan ditambahkan?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Kategori ini sudah ada:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -159,59 +160,59 @@ msgstr "Nopember"
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Setelan"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "beberapa detik yang lalu"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 menit lalu"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "hari ini"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "kemarin"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "bulan kemarin"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "beberapa bulan lalu"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "tahun kemarin"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "beberapa tahun lalu"
 
@@ -470,7 +471,7 @@ msgstr "Edit kategori"
 msgid "Add"
 msgstr "Tambahkan"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "peringatan keamanan"
 
@@ -480,71 +481,75 @@ msgid ""
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "tanpa generator angka acak, penyerang mungkin dapat menebak token reset kata kunci dan mengambil alih akun anda."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Buat sebuah <strong>akun admin</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Tingkat Lanjut"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Folder data"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Konfigurasi database"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "akan digunakan"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Pengguna database"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Password database"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Nama database"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "tablespace basis data"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Host database"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Selesaikan instalasi"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "web service dibawah kontrol anda"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Keluar"
 
@@ -566,14 +571,18 @@ msgstr "mohon ubah kata kunci untuk mengamankan akun anda"
 msgid "Lost your password?"
 msgstr "Lupa password anda?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "selalu login"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Masuk"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "sebelum"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 67a86d94ba0..c3b51b237dd 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -20,46 +20,60 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Tidak ada galat, berkas sukses diunggah"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "File yang diunggah melampaui directive MAX_FILE_SIZE yang disebutan dalam form HTML."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Berkas hanya diunggah sebagian"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Tidak ada berkas yang diunggah"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Kehilangan folder temporer"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Gagal menulis ke disk"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -71,11 +85,15 @@ msgstr "Berkas"
 msgid "Unshare"
 msgstr "batalkan berbagi"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Hapus"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr ""
 
@@ -180,31 +198,31 @@ msgstr "tautan tidak boleh kosong"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Ukuran"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po
index 29afd3eefda..70eaf1fc216 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "nama"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/id/files_versions.po b/l10n/id/files_versions.po
index 7b9d5d18745..490e0fc8163 100644
--- a/l10n/id/files_versions.po
+++ b/l10n/id/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "riwayat"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "pembuatan versi file"
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 92aab7dfbf7..2787995bd72 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -25,6 +25,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "autentikasi bermasalah"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr ""
@@ -49,10 +58,6 @@ msgstr "Email tidak sah"
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "autentikasi bermasalah"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr ""
@@ -115,7 +120,7 @@ msgstr "kesalahan"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Menyimpan..."
 
@@ -192,67 +197,83 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Password"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Tidak dapat merubah password anda"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Password saat ini"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "kata kunci baru"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "perlihatkan"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Rubah password"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Alamat email anda"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Masukkan alamat email untuk mengaktifkan pemulihan password"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Bahasa"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Bantu menerjemahkan"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -286,10 +307,6 @@ msgstr ""
 msgid "Other"
 msgstr "Lain-lain"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Admin Grup"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index ed63af8cccb..c105afaa81b 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -214,8 +214,8 @@ msgid "Use TLS"
 msgstr "gunakan TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "jangan gunakan untuk koneksi SSL, itu akan gagal."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/is/core.po b/l10n/is/core.po
index a1d13cee06d..5dd96b65d4b 100644
--- a/l10n/is/core.po
+++ b/l10n/is/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -52,8 +52,9 @@ msgid "No category to add?"
 msgstr "Enginn flokkur til að bæta við?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Þessi flokkur er þegar til:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -157,59 +158,59 @@ msgstr "Nóvember"
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Stillingar"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "sek síðan"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 min síðan"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} min síðan"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "Fyrir 1 klst."
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "fyrir {hours} klst."
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "í dag"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "í gær"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} dagar síðan"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "síðasta mánuði"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "fyrir {months} mánuðum"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "mánuðir síðan"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "síðasta ári"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "árum síðan"
 
@@ -468,7 +469,7 @@ msgstr "Breyta flokkum"
 msgid "Add"
 msgstr "Bæta"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Öryggis aðvörun"
 
@@ -478,71 +479,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Enginn traustur slembitölugjafi í boði, vinsamlegast virkjaðu PHP OpenSSL viðbótina."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Án öruggs slembitölugjafa er mögulegt að sjá fyrir öryggis auðkenni til að endursetja lykilorð og komast inn á aðganginn þinn."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Gagnamappan þín er að öllum líkindum aðgengileg frá internetinu. Skráin .htaccess sem fylgir með ownCloud er ekki að virka. Við mælum eindregið með því að þú stillir vefþjóninn þannig að gagnamappan verði ekki aðgengileg frá internetinu eða færir hana út fyrir vefrótina."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Útbúa <strong>vefstjóra aðgang</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Ítarlegt"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Gagnamappa"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Stilla gagnagrunn"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "verður notað"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Gagnagrunns notandi"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Gagnagrunns lykilorð"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Nafn gagnagrunns"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Töflusvæði gagnagrunns"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Netþjónn gagnagrunns"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Virkja uppsetningu"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "vefþjónusta undir þinni stjórn"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Útskrá"
 
@@ -564,14 +569,18 @@ msgstr "Vinsamlegast breyttu lykilorðinu þínu til að tryggja öryggi þitt."
 msgid "Lost your password?"
 msgstr "Týndir þú lykilorðinu?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "muna eftir mér"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "<strong>Skrá inn</strong>"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "fyrra"
diff --git a/l10n/is/files.po b/l10n/is/files.po
index f2e66b04646..a1ea0e3040f 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.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-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -18,46 +18,60 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Engin skrá var send inn. Óþekkt villa."
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Engin villa, innsending heppnaðist"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Innsend skrá er stærri en upload_max stillingin í php.ini:"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Innsenda skráin er stærri en MAX_FILE_SIZE sem skilgreint er í HTML sniðinu."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Einungis hluti af innsendri skrá skilaði sér"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Engin skrá skilaði sér"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Vantar bráðabirgðamöppu"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Tókst ekki að skrifa á disk"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Ekki nægt pláss tiltækt"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Ógild mappa."
 
@@ -69,11 +83,15 @@ msgstr "Skrár"
 msgid "Unshare"
 msgstr "Hætta deilingu"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Eyða"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Endurskýra"
 
@@ -178,31 +196,31 @@ msgstr "Vefslóð má ekki vera tóm."
 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:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Nafn"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Stærð"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Breytt"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} möppur"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 skrá"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} skrár"
 
diff --git a/l10n/is/files_trashbin.po b/l10n/is/files_trashbin.po
index 1fc4aad5716..808dfe5a4c3 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Nafn"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} möppur"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 skrá"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} skrár"
 
diff --git a/l10n/is/files_versions.po b/l10n/is/files_versions.po
index 1a0acfa5b88..5ee90ab20db 100644
--- a/l10n/is/files_versions.po
+++ b/l10n/is/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Saga"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Útgáfur af skrám"
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 07750ab9e75..fea2c378784 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -22,6 +22,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Ekki tókst að hlaða lista frá forrita síðu"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Villa við auðkenningu"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Hópur er þegar til"
@@ -46,10 +55,6 @@ msgstr "Ógilt netfang"
 msgid "Unable to delete group"
 msgstr "Ekki tókst að eyða hóp"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Villa við auðkenningu"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Ekki tókst að eyða notenda"
@@ -112,7 +117,7 @@ msgstr "Villa"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Er að vista ..."
 
@@ -189,67 +194,83 @@ msgstr "Hlaða niður Andoid hugbúnaði"
 msgid "Download iOS Client"
 msgstr "Hlaða niður iOS hugbúnaði"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Lykilorð"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Lykilorði þínu hefur verið breytt"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Ekki tókst að breyta lykilorðinu þínu"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Núverandi lykilorð"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Nýtt lykilorð"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "sýna"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Breyta lykilorði"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Netfang"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Netfangið þitt"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Sláðu inn netfangið þitt til að virkja endurheimt á lykilorði"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Tungumál"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Hjálpa við þýðingu"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Notaðu þessa vefslóð til að tengjast ownCloud svæðinu þínu"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Útgáfa"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -283,10 +304,6 @@ msgstr "Ótakmarkað"
 msgid "Other"
 msgstr "Annað"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Hópstjóri"
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index 7cfe3d0a425..7bc782a7b3c 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -214,7 +214,7 @@ msgid "Use TLS"
 msgstr ""
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
 #: templates/settings.php:39
diff --git a/l10n/it/core.po b/l10n/it/core.po
index b6f69691eec..9d72b5b8d27 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
-"Last-Translator: pgcloud <pgcloud@imballaggi.net>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
@@ -56,8 +56,9 @@ msgid "No category to add?"
 msgstr "Nessuna categoria da aggiungere?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Questa categoria esiste già: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr "Questa categoria esiste già: %s"
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -161,59 +162,59 @@ msgstr "Novembre"
 msgid "December"
 msgstr "Dicembre"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "secondi fa"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "Un minuto fa"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuti fa"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "1 ora fa"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{hours} ore fa"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "oggi"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} giorni fa"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "mese scorso"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{months} mesi fa"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "mesi fa"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "anno scorso"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "anni fa"
 
@@ -472,7 +473,7 @@ msgstr "Modifica le categorie"
 msgid "Add"
 msgstr "Aggiungi"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Avviso di sicurezza"
 
@@ -482,71 +483,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Non è disponibile alcun generatore di numeri casuali sicuro. Abilita l'estensione OpenSSL di PHP"
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Senza un generatore di numeri casuali sicuro, un malintenzionato potrebbe riuscire a individuare i token di ripristino delle password e impossessarsi del tuo account."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet. Il file .htaccess fornito da ownCloud non funziona. Ti suggeriamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile o sposta tale cartella fuori dalla radice del sito."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>account amministratore</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Cartella dati"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Configura il database"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "sarà utilizzato"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Utente del database"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Password del database"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Nome del database"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Spazio delle tabelle del database"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Host del database"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Termina la configurazione"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "servizi web nelle tue mani"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Esci"
 
@@ -568,14 +573,18 @@ msgstr "Cambia la password per rendere nuovamente sicuro il tuo account."
 msgid "Lost your password?"
 msgstr "Hai perso la password?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "ricorda"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Accedi"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr "Accessi alternativi"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "precedente"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 13d26fc18f2..fae888f3261 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
@@ -21,46 +21,60 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Nessun file è stato inviato. Errore sconosciuto"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Non ci sono errori, file caricato con successo"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Il file caricato supera la direttiva upload_max_filesize in php.ini:"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Il file caricato supera il valore MAX_FILE_SIZE definito nel form HTML"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Il file è stato parzialmente caricato"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Nessun file è stato caricato"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Cartella temporanea mancante"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Scrittura su disco non riuscita"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Spazio disponibile insufficiente"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Cartella non valida."
 
@@ -72,11 +86,15 @@ msgstr "File"
 msgid "Unshare"
 msgstr "Rimuovi condivisione"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr "Elimina definitivamente"
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Elimina"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Rinomina"
 
@@ -181,31 +199,31 @@ msgstr "L'URL non può essere vuoto."
 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:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Dimensione"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Modificato"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 cartella"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} cartelle"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 file"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} file"
 
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
index c4035fbac33..843b2a267d5 100644
--- a/l10n/it/files_encryption.po
+++ b/l10n/it/files_encryption.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-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-05 23:20+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"
@@ -46,15 +46,15 @@ msgstr "Cifratura"
 
 #: templates/settings-personal.php:7
 msgid "File encryption is enabled."
-msgstr ""
+msgstr "La cifratura dei file è abilitata."
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "I seguenti tipi di file non saranno cifrati:"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "Escludi i seguenti tipi di file dalla cifratura:"
 
 #: templates/settings.php:12
 msgid "None"
diff --git a/l10n/it/files_trashbin.po b/l10n/it/files_trashbin.po
index 8efe697487c..f023541c851 100644
--- a/l10n/it/files_trashbin.po
+++ b/l10n/it/files_trashbin.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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-07 23:30+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"
@@ -18,31 +18,45 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr "Impossibile eliminare %s definitivamente"
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr "Impossibile ripristinare %s"
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr "esegui operazione di ripristino"
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr "elimina il file definitivamente"
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Nome"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr "Eliminati"
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 cartella"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} cartelle"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 file"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} file"
 
diff --git a/l10n/it/files_versions.po b/l10n/it/files_versions.po
index 5bb90cec909..8953241ed54 100644
--- a/l10n/it/files_versions.po
+++ b/l10n/it/files_versions.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.
+# 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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-07 23:40+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"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr "Impossibild ripristinare: %s"
+
+#: history.php:40
+msgid "success"
+msgstr "completata"
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr "Il file %s è stato ripristinato alla versione %s"
+
+#: history.php:49
+msgid "failure"
+msgstr "non riuscita"
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr "Il file %s non può essere ripristinato alla versione %s"
+
+#: history.php:68
+msgid "No old versions available"
+msgstr "Non sono disponibili versioni precedenti"
+
+#: history.php:73
+msgid "No path specified"
+msgstr "Nessun percorso specificato"
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Cronologia"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr "Ripristina un file a una versione precedente facendo clic sul rispettivo pulsante di ripristino"
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Controllo di versione dei file"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index dbb539c7bb5..769e953dd01 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-01 23:30+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-06 23:21+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"
@@ -28,6 +28,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Impossibile caricare l'elenco dall'App Store"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Errore di autenticazione"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr "Impossibile cambiare il nome visualizzato"
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Il gruppo esiste già"
@@ -52,10 +61,6 @@ msgstr "Email non valida"
 msgid "Unable to delete group"
 msgstr "Impossibile eliminare il gruppo"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Errore di autenticazione"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Impossibile eliminare l'utente"
@@ -118,7 +123,7 @@ msgstr "Errore"
 msgid "Updated"
 msgstr "Aggiornato"
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Salvataggio in corso..."
 
@@ -195,67 +200,83 @@ msgstr "Scarica client Android"
 msgid "Download iOS Client"
 msgstr "Scarica client iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Password"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "La tua password è cambiata"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Modifica password non riuscita"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Password attuale"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Nuova password"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "mostra"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Modifica password"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Nome visualizzato"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr "Il tuo nome visualizzato è stato cambiato"
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr "Impossibile cambiare il tuo nome visualizzato"
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr "Cambia il nome visualizzato"
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Il tuo indirizzo email"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Inserisci il tuo indirizzo email per abilitare il recupero della password"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Lingua"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Migliora la traduzione"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Usa questo indirizzo per connetterti al tuo ownCloud dal tuo gestore file"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Versione"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -289,10 +310,6 @@ msgstr "Illimitata"
 msgid "Other"
 msgstr "Altro"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr "Nome visualizzato"
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Gruppi amministrati"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 4f07adf6ee3..9dcf0043194 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.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-02-04 00:05+0100\n"
-"PO-Revision-Date: 2013-02-02 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-07 23:40+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"
@@ -215,8 +215,8 @@ msgid "Use TLS"
 msgstr "Usa TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Non utilizzare per le connessioni SSL, fallirà."
+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:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index e2eb92b6806..312d7f72cef 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -53,8 +53,9 @@ msgid "No category to add?"
 msgstr "追加するカテゴリはありませんか？"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "このカテゴリはすでに存在します: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr "このカテゴリはすでに存在します: %s"
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -158,59 +159,59 @@ msgstr "11月"
 msgid "December"
 msgstr "12月"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "秒前"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 分前"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} 分前"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "1 時間前"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{hours} 時間前"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "今日"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "昨日"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} 日前"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "一月前"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{months} 月前"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "月前"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "一年前"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "年前"
 
@@ -469,7 +470,7 @@ msgstr "カテゴリを編集"
 msgid "Add"
 msgstr "追加"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "セキュリティ警告"
 
@@ -479,71 +480,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "セキュアな乱数生成器が利用可能ではありません。PHPのOpenSSL拡張を有効にして下さい。"
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "セキュアな乱数生成器が無い場合、攻撃者はパスワードリセットのトークンを予測してアカウントを乗っ取られる可能性があります。"
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "データディレクトリとファイルが恐らくインターネットからアクセスできるようになっています。ownCloudが提供する .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>."
+msgstr ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>管理者アカウント</strong>を作成してください"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "詳細設定"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "データフォルダ"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "データベースを設定してください"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "が使用されます"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "データベースのユーザ名"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "データベースのパスワード"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "データベース名"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "データベースの表領域"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "データベースのホスト名"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "セットアップを完了します"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "管理下にあるウェブサービス"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "ログアウト"
 
@@ -565,14 +570,18 @@ msgstr "アカウント保護の為、パスワードを再度の変更をお願
 msgid "Lost your password?"
 msgstr "パスワードを忘れましたか？"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "パスワードを記憶する"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "ログイン"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr "代替ログイン"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "前"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 97f0b6b3b73..52a59def6d6 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-04 00:04+0100\n"
-"PO-Revision-Date: 2013-02-03 04:30+0000\n"
-"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,6 +22,20 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "ファイルは何もアップロードされていません。不明なエラー"
@@ -58,8 +72,8 @@ msgid "Failed to write to disk"
 msgstr "ディスクへの書き込みに失敗しました"
 
 #: ajax/upload.php:52
-msgid "Not enough space available"
-msgstr "利用可能なスペースが十分にありません"
+msgid "Not enough storage available"
+msgstr ""
 
 #: ajax/upload.php:83
 msgid "Invalid directory."
@@ -73,11 +87,15 @@ msgstr "ファイル"
 msgid "Unshare"
 msgstr "共有しない"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr "完全に削除する"
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "削除"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "名前の変更"
 
@@ -182,31 +200,31 @@ msgstr "URLは空にできません。"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "無効なフォルダ名です。'Shared' の利用は ownCloud が予約済みです。"
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "名前"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "サイズ"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "更新日時"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 フォルダ"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} フォルダ"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 ファイル"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} ファイル"
 
diff --git a/l10n/ja_JP/files_encryption.po b/l10n/ja_JP/files_encryption.po
index 95a52309047..1f13d0117c7 100644
--- a/l10n/ja_JP/files_encryption.po
+++ b/l10n/ja_JP/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-08 00:09+0100\n"
+"PO-Revision-Date: 2013-02-07 02:20+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"
@@ -47,15 +47,15 @@ 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"
diff --git a/l10n/ja_JP/files_trashbin.po b/l10n/ja_JP/files_trashbin.po
index fb4805b52db..81066069c86 100644
--- a/l10n/ja_JP/files_trashbin.po
+++ b/l10n/ja_JP/files_trashbin.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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 04:10+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"
@@ -18,31 +18,45 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr "%s を完全に削除出来ませんでした"
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr "%s を復元出来ませんでした"
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr "復元操作を実行する"
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr "ファイルを完全に削除する"
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "名前"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr "削除済み"
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 フォルダ"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} フォルダ"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 ファイル"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} ファイル"
 
diff --git a/l10n/ja_JP/files_versions.po b/l10n/ja_JP/files_versions.po
index 5ebe43b4854..79e1e19a465 100644
--- a/l10n/ja_JP/files_versions.po
+++ b/l10n/ja_JP/files_versions.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013.
 #   <tetuyano+transi@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 04:20+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"
@@ -19,10 +20,45 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr "元に戻せませんでした: %s"
+
+#: history.php:40
+msgid "success"
+msgstr "成功"
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr "ファイル %s をバージョン %s に戻しました"
+
+#: history.php:49
+msgid "failure"
+msgstr "失敗"
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr "ファイル %s をバージョン %s に戻せませんでした"
+
+#: history.php:68
+msgid "No old versions available"
+msgstr "利用可能な古いバージョンはありません"
+
+#: history.php:73
+msgid "No path specified"
+msgstr "パスが指定されていません"
+
 #: js/versions.js:16
 msgid "History"
 msgstr "履歴"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr "もとに戻すボタンをクリックすると、ファイルを過去のバージョンに戻します"
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "ファイルのバージョン管理"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 80f56e5c654..d8f0f19d63d 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-04 00:05+0100\n"
-"PO-Revision-Date: 2013-02-03 04:30+0000\n"
-"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 02:20+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"
@@ -26,6 +26,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "アプリストアからリストをロードできません"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "認証エラー"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr "表示名を変更できません"
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "グループは既に存在しています"
@@ -50,10 +59,6 @@ msgstr "無効なメールアドレス"
 msgid "Unable to delete group"
 msgstr "グループを削除できません"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "認証エラー"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "ユーザを削除できません"
@@ -116,7 +121,7 @@ msgstr "エラー"
 msgid "Updated"
 msgstr "更新済み"
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "保存中..."
 
@@ -193,67 +198,83 @@ msgstr "Androidクライアントをダウンロード"
 msgid "Download iOS Client"
 msgstr "iOSクライアントをダウンロード"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "パスワード"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "パスワードを変更しました"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "パスワードを変更することができません"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "現在のパスワード"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "表示"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "パスワードを変更"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "表示名"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr "あなたの表示名を変更しました"
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr "あなたの表示名を変更できません"
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr "表示名を変更"
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "あなたのメールアドレス"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "※パスワード回復を有効にするにはメールアドレスの入力が必要です"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "言語"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "翻訳に協力する"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "ファイルマネージャでownCloudに接続する際はこのアドレスを利用してください"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "バージョン"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -287,10 +308,6 @@ msgstr "無制限"
 msgid "Other"
 msgstr "その他"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr "表示名"
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "グループ管理者"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index f899f457f15..0a8dc594153 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-04 00:05+0100\n"
-"PO-Revision-Date: 2013-02-03 04:40+0000\n"
-"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 04:10+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"
@@ -217,8 +217,8 @@ msgid "Use TLS"
 msgstr "TLSを利用"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "SSL接続に利用しないでください、失敗します。"
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr "LDAPS接続のために追加でそれを利用しないで下さい。失敗します。"
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index ab4062e7f60..9874547f038 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -51,8 +51,9 @@ msgid "No category to add?"
 msgstr "არ არის კატეგორია დასამატებლად?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "კატეგორია უკვე არსებობს"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -156,59 +157,59 @@ msgstr "ნოემბერი"
 msgid "December"
 msgstr "დეკემბერი"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "პარამეტრები"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "წამის წინ"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 წუთის წინ"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} წუთის წინ"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "დღეს"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "გუშინ"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} დღის წინ"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "გასულ თვეში"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "თვის წინ"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "ბოლო წელს"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "წლის წინ"
 
@@ -467,7 +468,7 @@ msgstr "კატეგორიების რედაქტირება"
 msgid "Add"
 msgstr "დამატება"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "უსაფრთხოების გაფრთხილება"
 
@@ -477,71 +478,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "შემთხვევითი სიმბოლოების გენერატორი არ არსებობს, გთხოვთ ჩართოთ PHP OpenSSL გაფართოება."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "შემთხვევითი სიმბოლოების გენერატორის გარეშე, შემტევმა შეიძლება ამოიცნოს თქვენი პაროლი შეგიცვალოთ ის და დაეუფლოს თქვენს ექაუნთს."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "შექმენი ადმინ ექაუნტი"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Advanced"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "მონაცემთა საქაღალდე"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "ბაზის კონფიგურირება"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "გამოყენებული იქნება"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "ბაზის მომხმარებელი"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "ბაზის პაროლი"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "ბაზის სახელი"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "ბაზის ცხრილის ზომა"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "ბაზის ჰოსტი"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "კონფიგურაციის დასრულება"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "თქვენი კონტროლის ქვეშ მყოფი ვებ სერვისები"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "გამოსვლა"
 
@@ -563,14 +568,18 @@ msgstr ""
 msgid "Lost your password?"
 msgstr "დაგავიწყდათ პაროლი?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "დამახსოვრება"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "შესვლა"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "წინა"
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index 1866d1f711a..640d3d1fabd 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/files.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-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -18,46 +18,60 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "ჭოცდომა არ დაფიქსირდა, ფაილი წარმატებით აიტვირთა"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "ატვირთული ფაილი აჭარბებს  MAX_FILE_SIZE დირექტივას, რომელიც მითითებულია HTML ფორმაში"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "ატვირთული ფაილი მხოლოდ ნაწილობრივ აიტვირთა"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "ფაილი არ აიტვირთა"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "დროებითი საქაღალდე არ არსებობს"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "შეცდომა დისკზე ჩაწერისას"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -69,11 +83,15 @@ msgstr "ფაილები"
 msgid "Unshare"
 msgstr "გაზიარების მოხსნა"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "წაშლა"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "გადარქმევა"
 
@@ -178,31 +196,31 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "სახელი"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "ზომა"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "შეცვლილია"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 საქაღალდე"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} საქაღალდე"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 ფაილი"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} ფაილი"
 
diff --git a/l10n/ka_GE/files_trashbin.po b/l10n/ka_GE/files_trashbin.po
index 92a719c9523..0b9d8c59f9c 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -17,31 +17,45 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "სახელი"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 საქაღალდე"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} საქაღალდე"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 ფაილი"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} ფაილი"
 
diff --git a/l10n/ka_GE/files_versions.po b/l10n/ka_GE/files_versions.po
index aafddd05a3c..56f77fc8527 100644
--- a/l10n/ka_GE/files_versions.po
+++ b/l10n/ka_GE/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -17,10 +17,45 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index 7c1f5129d4c..2f73884030e 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -22,6 +22,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "აპლიკაციების სია ვერ ჩამოიტვირთა App Store"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "ავთენტიფიკაციის შეცდომა"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "ჯგუფი უკვე არსებობს"
@@ -46,10 +55,6 @@ msgstr "არასწორი იმეილი"
 msgid "Unable to delete group"
 msgstr "ჯგუფის წაშლა ვერ მოხერხდა"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "ავთენტიფიკაციის შეცდომა"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "მომხმარებლის წაშლა ვერ მოხერხდა"
@@ -112,7 +117,7 @@ msgstr "შეცდომა"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "შენახვა..."
 
@@ -189,67 +194,83 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "პაროლი"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "თქვენი პაროლი შეიცვალა"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "თქვენი პაროლი არ შეიცვალა"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "მიმდინარე პაროლი"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "ახალი პაროლი"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "გამოაჩინე"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "პაროლის შეცვლა"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "იმეილი"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "თქვენი იმეილ მისამართი"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "შეავსეთ იმეილ მისამართის ველი პაროლის აღსადგენად"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "ენა"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "თარგმნის დახმარება"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -283,10 +304,6 @@ msgstr ""
 msgid "Other"
 msgstr "სხვა"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "ჯგუფის ადმინისტრატორი"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index a84ba3cd3c8..2e2cd16393e 100644
--- a/l10n/ka_GE/user_ldap.po
+++ b/l10n/ka_GE/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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -213,7 +213,7 @@ msgid "Use TLS"
 msgstr ""
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
 #: templates/settings.php:39
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 765fcfeba04..72fae94a3df 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,8 +55,9 @@ msgid "No category to add?"
 msgstr "추가할 분류가 없습니까?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "이 분류는 이미 존재합니다:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -160,59 +161,59 @@ msgstr "11월"
 msgid "December"
 msgstr "12월"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "설정"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "초 전"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1분 전"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes}분 전"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "1시간 전"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{hours}시간 전"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "오늘"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "어제"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days}일 전"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "지난 달"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{months}개월 전"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "개월 전"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "작년"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "년 전"
 
@@ -471,7 +472,7 @@ msgstr "분류 편집"
 msgid "Add"
 msgstr "추가"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "보안 경고"
 
@@ -481,71 +482,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "안전한 난수 생성기를 사용할 수 없습니다. PHP의 OpenSSL 확장을 활성화해 주십시오."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "안전한 난수 생성기를 사용하지 않으면 공격자가 암호 초기화 토큰을 추측하여 계정을 탈취할 수 있습니다."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "데이터 디렉터리와 파일을 인터넷에서 접근할 수 있는 것 같습니다. ownCloud에서 제공한 .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>."
+msgstr ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>관리자 계정</strong> 만들기"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "고급"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "데이터 폴더"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "데이터베이스 설정"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "사용될 예정"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "데이터베이스 사용자"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "데이터베이스 암호"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "데이터베이스 이름"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "데이터베이스 테이블 공간"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "데이터베이스 호스트"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "설치 완료"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "내가 관리하는 웹 서비스"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "로그아웃"
 
@@ -567,14 +572,18 @@ msgstr "계정의 안전을 위하여 암호를 변경하십시오."
 msgid "Lost your password?"
 msgstr "암호를 잊으셨습니까?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "기억하기"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "로그인"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "이전"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 02a13830991..3b842ed2525 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -23,46 +23,60 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "파일이 업로드되지 않았습니다. 알 수 없는 오류입니다"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "업로드에 성공하였습니다."
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "업로드한 파일이 php.ini의 upload_max_filesize보다 큽니다:"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "업로드한 파일이 HTML 문서에 지정한 MAX_FILE_SIZE보다 더 큼"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "파일이 부분적으로 업로드됨"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "업로드된 파일 없음"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "임시 폴더가 사라짐"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "디스크에 쓰지 못했습니다"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "여유 공간이 부족합니다"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "올바르지 않은 디렉터리입니다."
 
@@ -74,11 +88,15 @@ msgstr "파일"
 msgid "Unshare"
 msgstr "공유 해제"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "삭제"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "이름 바꾸기"
 
@@ -183,31 +201,31 @@ msgstr "URL을 입력해야 합니다."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "폴더 이름이 유효하지 않습니다. "
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "이름"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "크기"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "수정됨"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "폴더 1개"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "폴더 {count}개"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "파일 1개"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "파일 {count}개"
 
diff --git a/l10n/ko/files_trashbin.po b/l10n/ko/files_trashbin.po
index a87ddd6b8dd..85904a36e17 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "이름"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "폴더 1개"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "폴더 {count}개"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "파일 1개"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "파일 {count}개"
 
diff --git a/l10n/ko/files_versions.po b/l10n/ko/files_versions.po
index 0fe524b7701..9e99e48e771 100644
--- a/l10n/ko/files_versions.po
+++ b/l10n/ko/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -19,10 +19,45 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "역사"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "파일 버전 관리"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 62097ea4a5a..65a8c9d6e22 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -26,6 +26,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "앱 스토어에서 목록을 가져올 수 없습니다"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "인증 오류"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "그룹이 이미 존재합니다."
@@ -50,10 +59,6 @@ msgstr "잘못된 이메일 주소"
 msgid "Unable to delete group"
 msgstr "그룹을 삭제할 수 없습니다."
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "인증 오류"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "사용자를 삭제할 수 없습니다."
@@ -116,7 +121,7 @@ msgstr "오류"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "저장 중..."
 
@@ -193,67 +198,83 @@ msgstr "안드로이드 클라이언트 다운로드"
 msgid "Download iOS Client"
 msgstr "iOS 클라이언트 다운로드"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "암호"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "암호가 변경되었습니다"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "암호를 변경할 수 없음"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "현재 암호"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "새 암호"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "보이기"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "암호 변경"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "표시 이름"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "이메일"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "이메일 주소"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "암호 찾기 기능을 사용하려면 이메일 주소를 입력하십시오."
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "언어"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "번역 돕기"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "파일 관리자에서 ownCloud에 접속하려면 이 주소를 사용하십시오."
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "버전"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -287,10 +308,6 @@ msgstr "무제한"
 msgid "Other"
 msgstr "기타"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr "표시 이름"
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "그룹 관리자"
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index 93e6a601aa0..1402718d755 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -216,8 +216,8 @@ msgid "Use TLS"
 msgstr "TLS 사용"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "SSL 연결 시 사용하는 경우 연결되지 않습니다."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index f05ab88b030..f665ac3e0af 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -51,7 +51,8 @@ msgid "No category to add?"
 msgstr ""
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
+#, php-format
+msgid "This category already exists: %s"
 msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
@@ -156,59 +157,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "ده‌ستكاری"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr ""
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr ""
 
@@ -467,7 +468,7 @@ msgstr ""
 msgid "Add"
 msgstr "زیادکردن"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr ""
 
@@ -477,71 +478,75 @@ msgid ""
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr ""
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "هه‌ڵبژاردنی پیشكه‌وتوو"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "زانیاری فۆڵده‌ر"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "به‌كارهێنه‌ری داتابه‌یس"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "وشه‌ی نهێنی داتا به‌یس"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "ناوی داتابه‌یس"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "هۆستی داتابه‌یس"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "كۆتایی هات ده‌ستكاریه‌كان"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "چوونەدەرەوە"
 
@@ -563,14 +568,18 @@ msgstr ""
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr ""
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "پێشتر"
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index d8cb9b82a79..a94f4636966 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-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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,46 +17,60 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -68,11 +82,15 @@ msgstr ""
 msgid "Unshare"
 msgstr ""
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr ""
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr ""
 
@@ -177,31 +195,31 @@ msgstr "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "ناو"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/ku_IQ/files_trashbin.po b/l10n/ku_IQ/files_trashbin.po
index f1318338be4..37690656b8b 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "ناو"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/ku_IQ/files_versions.po b/l10n/ku_IQ/files_versions.po
index b3fa1af6357..d241d5d28b9 100644
--- a/l10n/ku_IQ/files_versions.po
+++ b/l10n/ku_IQ/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "مێژوو"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "وه‌شانی په‌ڕگه"
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index adb4e79653e..7973f6b16d5 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -21,6 +21,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr ""
@@ -45,10 +54,6 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr ""
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr ""
@@ -111,7 +116,7 @@ msgstr "هه‌ڵه"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "پاشکه‌وتده‌کات..."
 
@@ -188,67 +193,83 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "وشەی تێپەربو"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "وشەی نهێنی نوێ"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr ""
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "ئیمه‌یل"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -282,10 +303,6 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index 33cf75e5ea1..88137f8ee47 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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -213,7 +213,7 @@ msgid "Use TLS"
 msgstr ""
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
 #: templates/settings.php:39
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index b365652b49a..a3e8cd581d7 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -52,8 +52,9 @@ msgid "No category to add?"
 msgstr "Keng Kategorie fir bäizesetzen?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Des Kategorie existéiert schonn:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -157,59 +158,59 @@ msgstr "November"
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Astellungen"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "vrun 1 Stonn"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "vru {hours} Stonnen"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr ""
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "Läschte Mount"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "vru {months} Méint"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "Méint hier"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "Läscht Joer"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "Joren hier"
 
@@ -468,7 +469,7 @@ msgstr "Kategorien editéieren"
 msgid "Add"
 msgstr "Bäisetzen"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Sécherheets Warnung"
 
@@ -478,71 +479,75 @@ msgid ""
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr ""
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "En <strong>Admin Account</strong> uleeën"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Avancéiert"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Daten Dossier"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Datebank konfiguréieren"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "wärt benotzt ginn"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Datebank Benotzer"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Datebank Passwuert"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Datebank Numm"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Datebank Tabelle-Gréisst"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Datebank Server"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Installatioun ofschléissen"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "Web Servicer ënnert denger Kontroll"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Ausloggen"
 
@@ -564,14 +569,18 @@ msgstr ""
 msgid "Lost your password?"
 msgstr "Passwuert vergiess?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "verhalen"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Log dech an"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "zeréck"
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 01de41c0d8e..fd8f5e4c98c 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.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-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -18,46 +18,60 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Keen Feeler, Datei ass komplett ropgelueden ginn"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Déi ropgelueden Datei ass méi grouss wei d'MAX_FILE_SIZE Eegenschaft déi an der HTML form uginn ass"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Déi ropgelueden Datei ass nëmmen hallef ropgelueden ginn"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Et ass keng Datei ropgelueden ginn"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Et feelt en temporären Dossier"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Konnt net op den Disk schreiwen"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -69,11 +83,15 @@ msgstr "Dateien"
 msgid "Unshare"
 msgstr "Net méi deelen"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Läschen"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr ""
 
@@ -178,31 +196,31 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Numm"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Gréisst"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Geännert"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/lb/files_trashbin.po b/l10n/lb/files_trashbin.po
index 7ddea15d47e..2d2039da8de 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Numm"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/lb/files_versions.po b/l10n/lb/files_versions.po
index 3eeeda4f063..1b9a2bc1c06 100644
--- a/l10n/lb/files_versions.po
+++ b/l10n/lb/files_versions.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-01-27 00:04+0100\n"
-"PO-Revision-Date: 2013-01-26 12:27+0000\n"
-"Last-Translator: sim0n <sim0n@trypill.org>\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Historique"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Fichier's Versionéierung "
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index e2d2d5243d3..021e271d8fe 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -22,6 +22,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Konnt Lescht net vum App Store lueden"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Authentifikatioun's Fehler"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr ""
@@ -46,10 +55,6 @@ msgstr "Ongülteg e-mail"
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Authentifikatioun's Fehler"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr ""
@@ -112,7 +117,7 @@ msgstr "Fehler"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Speicheren..."
 
@@ -189,67 +194,83 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Passwuert"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Konnt däin Passwuert net änneren"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Momentan 't Passwuert"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Neit Passwuert"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "weisen"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Passwuert änneren"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Deng Email Adress"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Gëff eng Email Adress an fir d'Passwuert recovery ze erlaben"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Sprooch"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Hëllef iwwersetzen"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -283,10 +304,6 @@ msgstr ""
 msgid "Other"
 msgstr "Aner"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Gruppen Admin"
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index a7cdcba6fe6..dae69e9634d 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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -213,7 +213,7 @@ msgid "Use TLS"
 msgstr ""
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
 #: templates/settings.php:39
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 7d3c632fd08..423db4d6592 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -52,8 +52,9 @@ msgid "No category to add?"
 msgstr "Nepridėsite jokios kategorijos?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Tokia kategorija jau yra:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -157,59 +158,59 @@ msgstr "Lapkritis"
 msgid "December"
 msgstr "Gruodis"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "prieš sekundę"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "Prieš 1 minutę"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "Prieš {count} minutes"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "šiandien"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "Prieš {days}  dienas"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "praeitą mėnesį"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "prieš mėnesį"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "praeitais metais"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "prieš metus"
 
@@ -468,7 +469,7 @@ msgstr "Redaguoti kategorijas"
 msgid "Add"
 msgstr "Pridėti"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Saugumo pranešimas"
 
@@ -478,71 +479,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Saugaus atsitiktinių skaičių generatoriaus nėra, prašome įjungti PHP OpenSSL modulį."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Be saugaus atsitiktinių skaičių generatoriaus, piktavaliai gali atspėti Jūsų slaptažodį ir pasisavinti paskyrą."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Jūsų duomenų aplankalas ir Jūsų failai turbūt yra pasiekiami per internetą. Failas .htaccess, kuris duodamas, neveikia. Mes rekomenduojame susitvarkyti savo nustatymsu taip, kad failai nebūtų pasiekiami per internetą, arba persikelti juos kitur."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Sukurti <strong>administratoriaus paskyrą</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Išplėstiniai"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Duomenų katalogas"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Nustatyti duomenų bazę"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "bus naudojama"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Duomenų bazės vartotojas"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Duomenų bazės slaptažodis"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Duomenų bazės pavadinimas"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Duomenų bazės loginis saugojimas"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Duomenų bazės serveris"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Baigti diegimą"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "jūsų valdomos web paslaugos"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Atsijungti"
 
@@ -564,14 +569,18 @@ msgstr "Prašome pasikeisti slaptažodį dar kartą, dėl paskyros saugumo."
 msgid "Lost your password?"
 msgstr "Pamiršote slaptažodį?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "prisiminti"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Prisijungti"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "atgal"
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 4776b8e8f10..33d7eb0d16c 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -20,46 +20,60 @@ 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/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Klaidų nėra, failas įkeltas sėkmingai"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Įkeliamo failo dydis viršija MAX_FILE_SIZE parametrą, kuris yra nustatytas HTML formoje"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Failas buvo įkeltas tik dalinai"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Nebuvo įkeltas nė vienas failas"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Nėra laikinojo katalogo"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Nepavyko įrašyti į diską"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -71,11 +85,15 @@ msgstr "Failai"
 msgid "Unshare"
 msgstr "Nebesidalinti"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Pervadinti"
 
@@ -180,31 +198,31 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Dydis"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Pakeista"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 aplankalas"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} aplankalai"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 failas"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} failai"
 
diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po
index af1841dd647..b5e0d72e3f3 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ 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"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 aplankalas"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} aplankalai"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 failas"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} failai"
 
diff --git a/l10n/lt_LT/files_versions.po b/l10n/lt_LT/files_versions.po
index b3cf7ff9e97..42087e7e323 100644
--- a/l10n/lt_LT/files_versions.po
+++ b/l10n/lt_LT/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -19,10 +19,45 @@ 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/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Istorija"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Failų versijos"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 1499763e4ff..e1ef964d696 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -23,6 +23,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Neįmanoma įkelti sąrašo iš Programų Katalogo"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Autentikacijos klaida"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr ""
@@ -47,10 +56,6 @@ msgstr "Netinkamas el. paštas"
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Autentikacijos klaida"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr ""
@@ -113,7 +118,7 @@ msgstr "Klaida"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Saugoma.."
 
@@ -190,67 +195,83 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Jūsų slaptažodis buvo pakeistas"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Neįmanoma pakeisti slaptažodžio"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Dabartinis slaptažodis"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Naujas slaptažodis"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "rodyti"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Pakeisti slaptažodį"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "El. paštas"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Jūsų el. pašto adresas"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Kalba"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Padėkite išversti"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -284,10 +305,6 @@ msgstr ""
 msgid "Other"
 msgstr "Kita"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 360405cc4d1..a0eca3ff0fc 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -214,7 +214,7 @@ msgid "Use TLS"
 msgstr "Naudoti TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
 #: templates/settings.php:39
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 8c8994628c9..c64e2073ede 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 19:10+0000\n"
-"Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,8 +52,9 @@ msgid "No category to add?"
 msgstr "Nav kategoriju, ko pievienot?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Šāda kategorija jau eksistē:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr "Šāda kategorija jau eksistē — %s"
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -157,59 +158,59 @@ msgstr "Novembris"
 msgid "December"
 msgstr "Decembris"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: js/js.js:760
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "sekundes atpakaļ"
 
-#: js/js.js:761
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "pirms 1 minūtes"
 
-#: js/js.js:762
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "pirms {minutes} minūtēm"
 
-#: js/js.js:763
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "pirms 1 stundas"
 
-#: js/js.js:764
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "pirms {hours} stundām"
 
-#: js/js.js:765
+#: js/js.js:769
 msgid "today"
 msgstr "šodien"
 
-#: js/js.js:766
+#: js/js.js:770
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:767
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "pirms {days} dienām"
 
-#: js/js.js:768
+#: js/js.js:772
 msgid "last month"
 msgstr "pagājušajā mēnesī"
 
-#: js/js.js:769
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "pirms {months} mēnešiem"
 
-#: js/js.js:770
+#: js/js.js:774
 msgid "months ago"
 msgstr "mēnešus atpakaļ"
 
-#: js/js.js:771
+#: js/js.js:775
 msgid "last year"
 msgstr "gājušajā gadā"
 
-#: js/js.js:772
+#: js/js.js:776
 msgid "years ago"
 msgstr "gadus atpakaļ"
 
@@ -468,7 +469,7 @@ msgstr "Rediģēt kategoriju"
 msgid "Add"
 msgstr "Pievienot"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Brīdinājums par drošību"
 
@@ -478,71 +479,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Nav pieejams drošs nejaušu skaitļu ģenerators. Lūdzu, aktivējiet PHP OpenSSL paplašinājumu."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Bez droša nejaušu skaitļu ģeneratora uzbrucējs var paredzēt paroļu atjaunošanas marķierus un pārņem jūsu kontu."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Jūsu datu direktorija un datnes visdrīzāk ir pieejamas no interneta. ownCloud nodrošinātā .htaccess datne nedarbojas. Mēs iesakām konfigurēt serveri tā, lai datu direktorija vairs nebūtu pieejama, vai arī pārvietojiet datu direktoriju ārpus tīmekļa servera dokumentu saknes."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Izveidot <strong>administratora kontu</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Paplašināti"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Datu mape"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Konfigurēt datubāzi"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "tiks izmantots"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Datubāzes lietotājs"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Datubāzes parole"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Datubāzes nosaukums"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Datubāzes tabulas telpa"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Datubāzes serveris"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Pabeigt iestatīšanu"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "jūsu vadībā esošie tīmekļa servisi"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Izrakstīties"
 
@@ -572,6 +577,10 @@ msgstr "atcerēties"
 msgid "Log in"
 msgstr "Ierakstīties"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr "Alternatīvās pieteikšanās"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "iepriekšējā"
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index 34debdd2e72..803cbc17253 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 18:40+0000\n"
-"Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,6 +20,20 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Netika augšupielādēta neviena datne. Nezināma kļūda"
@@ -56,8 +70,8 @@ msgid "Failed to write to disk"
 msgstr "Neizdevās saglabāt diskā"
 
 #: ajax/upload.php:52
-msgid "Not enough space available"
-msgstr "Nepietiek brīvas vietas"
+msgid "Not enough storage available"
+msgstr ""
 
 #: ajax/upload.php:83
 msgid "Invalid directory."
@@ -71,11 +85,15 @@ msgstr "Datnes"
 msgid "Unshare"
 msgstr "Pārtraukt dalīšanos"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr "Dzēst pavisam"
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Dzēst"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Pārsaukt"
 
diff --git a/l10n/lv/files_encryption.po b/l10n/lv/files_encryption.po
index a289289f89e..c5f33459a22 100644
--- a/l10n/lv/files_encryption.po
+++ b/l10n/lv/files_encryption.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-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 20:40+0000\n"
+"Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,15 +46,15 @@ msgstr "Šifrēšana"
 
 #: templates/settings-personal.php:7
 msgid "File encryption is enabled."
-msgstr ""
+msgstr "Datņu šifrēšana ir aktivēta."
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "Sekojošās datnes netiks šifrētas:"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "Sekojošos datņu tipus izslēgt no šifrēšanas:"
 
 #: templates/settings.php:12
 msgid "None"
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index 6d52e10de6a..3e20fdad264 100644
--- a/l10n/lv/files_sharing.po
+++ b/l10n/lv/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-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 18:30+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 21:40+0000\n"
 "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\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_trashbin.po b/l10n/lv/files_trashbin.po
index 11024c8e1e0..ef9c6063c3b 100644
--- a/l10n/lv/files_trashbin.po
+++ b/l10n/lv/files_trashbin.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-02-04 00:05+0100\n"
-"PO-Revision-Date: 2013-02-03 21:00+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 12:20+0000\n"
 "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,31 +18,45 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr "Nevarēja pilnībā izdzēst %s"
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr "Nevarēja atjaunot %s"
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr "veikt atjaunošanu"
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr "dzēst datni pavisam"
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Nosaukums"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr "Dzēsts"
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 mape"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} mapes"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 datne"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} datnes"
 
diff --git a/l10n/lv/files_versions.po b/l10n/lv/files_versions.po
index fa500081cc3..7d9e6940598 100644
--- a/l10n/lv/files_versions.po
+++ b/l10n/lv/files_versions.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-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 10:50+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 12:20+0000\n"
 "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr "Nevarēja atgriezt — %s"
+
+#: history.php:40
+msgid "success"
+msgstr "veiksme"
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr "Datne %s tika atgriezt uz versiju %s"
+
+#: history.php:49
+msgid "failure"
+msgstr "neveiksme"
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr "Datni %s nevarēja atgriezt uz versiju %s"
+
+#: history.php:68
+msgid "No old versions available"
+msgstr "Nav pieejamu vecāku versiju"
+
+#: history.php:73
+msgid "No path specified"
+msgstr "Nav norādīts ceļš"
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Vēsture"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr "Atgriez datni uz iepriekšēju versiju, spiežot uz tās atgriešanas pogu"
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Datņu versiju izskošana"
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index ae6df933b41..3dd07bcc2b2 100644
--- a/l10n/lv/lib.po
+++ b/l10n/lv/lib.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-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 14:31+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 21:40+0000\n"
 "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: app.php:312
+#: app.php:313
 msgid "Help"
 msgstr "Palīdzība"
 
-#: app.php:319
+#: app.php:320
 msgid "Personal"
 msgstr "Personīgi"
 
-#: app.php:324
+#: app.php:325
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: app.php:329
+#: app.php:330
 msgid "Users"
 msgstr "Lietotāji"
 
-#: app.php:336
+#: app.php:337
 msgid "Apps"
 msgstr "Lietotnes"
 
-#: app.php:338
+#: app.php:339
 msgid "Admin"
 msgstr "Administratori"
 
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 72b99de743c..2cd29ffc5a4 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 19:10+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 04:30+0000\n"
 "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Nevar lejupielādēt sarakstu no lietotņu veikala"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Autentifikācijas kļūda"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr "Nevarēja mainīt redzamo vārdu"
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Grupa jau eksistē"
@@ -48,10 +57,6 @@ msgstr "Nederīgs epasts"
 msgid "Unable to delete group"
 msgstr "Nevar izdzēst grupu"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Autentifikācijas kļūda"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Nevar izdzēst lietotāju"
@@ -114,7 +119,7 @@ msgstr "Kļūda"
 msgid "Updated"
 msgstr "Atjaunināta"
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Saglabā..."
 
@@ -191,67 +196,83 @@ msgstr "Lejupielādēt Android klientu"
 msgid "Download iOS Client"
 msgstr "Lejupielādēt iOS klientu"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Parole"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Jūru parole tika nomainīta"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Nevar nomainīt jūsu paroli"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Pašreizējā parole"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Jauna parole"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "parādīt"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Mainīt paroli"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Redzamais vārds"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr "Jūsu redzamais vārds tika mainīts"
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr "Nevarēja mainīt jūsu redzamo vārdu"
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr "Mainīt redzamo vārdu"
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "E-pasts"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Jūsu e-pasta adrese"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ievadiet epasta adresi, lai vēlāk varētu atgūt paroli, ja būs nepieciešamība"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Valoda"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Palīdzi tulkot"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Izmanto šo adresi, lai, izmantojot datņu pārvaldnieku, savienotos ar savu ownCloud"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Versija"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -285,10 +306,6 @@ msgstr "Neierobežota"
 msgid "Other"
 msgstr "Cits"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr "Redzamais vārds"
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grupas administrators"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index ac6a97fa0f2..3635e7a2787 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.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-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 14:21+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 12:20+0000\n"
 "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -214,8 +214,8 @@ msgid "Use TLS"
 msgstr "Lietot TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Neizmanto to SSL savienojumiem, tas neizdosies."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr "Neizmanto papildu LDAPS savienojumus! Tas nestrādās."
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index a06a664bec0..547295277d1 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -53,8 +53,9 @@ msgid "No category to add?"
 msgstr "Нема категорија да се додаде?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Оваа категорија веќе постои:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -158,59 +159,59 @@ msgstr "Ноември"
 msgid "December"
 msgstr "Декември"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Поставки"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "пред секунди"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "пред 1 минута"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "пред {minutes} минути"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "пред 1 час"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "пред {hours} часови"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "денеска"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "пред {days} денови"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "минатиот месец"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "пред {months} месеци"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "пред месеци"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "минатата година"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "пред години"
 
@@ -469,7 +470,7 @@ msgstr "Уреди категории"
 msgid "Add"
 msgstr "Додади"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Безбедносно предупредување"
 
@@ -479,71 +480,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Не е достапен безбеден генератор на случајни броеви, Ве молам озвоможете го OpenSSL PHP додатокот."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Без сигурен генератор на случајни броеви напаѓач може да ги предвиди жетоните за ресетирање на лозинка и да преземе контрола врз Вашата сметка. "
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Вашата папка со податоци и датотеките е најверојатно достапна од интернет. .htaccess датотеката што ја овозможува ownCloud не фунционира. Силно препорачуваме да го исконфигурирате вашиот сервер за вашата папка со податоци не е достапна преку интернетт или преместете ја надвор од коренот на веб серверот."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Направете <strong>администраторска сметка</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Напредно"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Фолдер со податоци"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Конфигурирај ја базата"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "ќе биде користено"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Корисник на база"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Лозинка на база"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Име на база"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Табела во базата на податоци"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Сервер со база"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Заврши го подесувањето"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "веб сервиси под Ваша контрола"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Одјава"
 
@@ -565,14 +570,18 @@ msgstr "Ве молам сменете ја лозинката да ја обе�
 msgid "Lost your password?"
 msgstr "Ја заборавивте лозинката?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "запамти"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Најава"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "претходно"
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 941e084b4a1..67955f49c62 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -20,46 +20,60 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Ниту еден фајл не се вчита. Непозната грешка"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Нема грешка, датотеката беше подигната успешно"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Подигнатата датотека ја надминува upload_max_filesize директивата во php.ini:"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Подигнатата датотеката ја надминува MAX_FILE_SIZE директивата која беше поставена во HTML формата"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Датотеката беше само делумно подигната."
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Не беше подигната датотека"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Не постои привремена папка"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Неуспеав да запишам на диск"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -71,11 +85,15 @@ msgstr "Датотеки"
 msgid "Unshare"
 msgstr "Не споделувај"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Избриши"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Преименувај"
 
@@ -180,31 +198,31 @@ msgstr "Адресата неможе да биде празна."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Големина"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Променето"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} папки"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 датотека"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} датотеки"
 
diff --git a/l10n/mk/files_trashbin.po b/l10n/mk/files_trashbin.po
index 567a2b7aaef..6fe48847d75 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Име"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} папки"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 датотека"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} датотеки"
 
diff --git a/l10n/mk/files_versions.po b/l10n/mk/files_versions.po
index 3f4e68131e3..3ea9e4d20c3 100644
--- a/l10n/mk/files_versions.po
+++ b/l10n/mk/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Историја"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Верзии на датотеки"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index c863d2c2a33..f441c26ada4 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -24,6 +24,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Неможам да вчитам листа од App Store"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Грешка во автентикација"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Групата веќе постои"
@@ -48,10 +57,6 @@ msgstr "Неисправна електронска пошта"
 msgid "Unable to delete group"
 msgstr "Неможе да избришам група"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Грешка во автентикација"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Неможам да избришам корисник"
@@ -114,7 +119,7 @@ msgstr "Грешка"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Снимам..."
 
@@ -191,67 +196,83 @@ msgstr "Преземи клиент за Андроид"
 msgid "Download iOS Client"
 msgstr "Преземи iOS клиент"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Вашата лозинка беше променета."
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Вашата лозинка неможе да се смени"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Моментална лозинка"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Нова лозинка"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "прикажи"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Смени лозинка"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Е-пошта"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Вашата адреса за е-пошта"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Пополни ја адресата за е-пошта за да може да ја обновуваш лозинката"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Јазик"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Помогни во преводот"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Користете ја оваа адреса да "
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Верзија"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -285,10 +306,6 @@ msgstr ""
 msgid "Other"
 msgstr "Останато"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Администратор на група"
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 7380a12ef33..78d3ca3305f 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -214,7 +214,7 @@ msgid "Use TLS"
 msgstr ""
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
 #: templates/settings.php:39
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 0ae9e04e981..e52ed670306 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -53,8 +53,9 @@ msgid "No category to add?"
 msgstr "Tiada kategori untuk di tambah?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Kategori ini telah wujud"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -158,59 +159,59 @@ msgstr "November"
 msgid "December"
 msgstr "Disember"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Tetapan"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr ""
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr ""
 
@@ -469,7 +470,7 @@ msgstr "Edit kategori"
 msgid "Add"
 msgstr "Tambah"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Amaran keselamatan"
 
@@ -479,71 +480,75 @@ msgid ""
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr ""
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "buat <strong>akaun admin</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Maju"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Fail data"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Konfigurasi pangkalan data"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "akan digunakan"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Nama pengguna pangkalan data"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Kata laluan pangkalan data"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Nama pangkalan data"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Hos pangkalan data"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Setup selesai"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "Perkhidmatan web di bawah kawalan anda"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Log keluar"
 
@@ -565,14 +570,18 @@ msgstr ""
 msgid "Lost your password?"
 msgstr "Hilang kata laluan?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "ingat"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Log masuk"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "sebelum"
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 6e6a0e262c6..fe69de831b7 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -21,46 +21,60 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Tiada fail dimuatnaik. Ralat tidak diketahui."
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Tiada ralat, fail berjaya dimuat naik."
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Fail yang dimuat naik melebihi MAX_FILE_SIZE yang dinyatakan dalam form HTML "
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Sebahagian daripada fail telah dimuat naik. "
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Tiada fail yang dimuat naik"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Folder sementara hilang"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Gagal untuk disimpan"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -72,11 +86,15 @@ msgstr "fail"
 msgid "Unshare"
 msgstr ""
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Padam"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr ""
 
@@ -181,31 +199,31 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Nama "
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Saiz"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/ms_MY/files_trashbin.po b/l10n/ms_MY/files_trashbin.po
index c3efccaa15d..047d892067f 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Nama"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/ms_MY/files_versions.po b/l10n/ms_MY/files_versions.po
index 389afec231e..c6fa87619d2 100644
--- a/l10n/ms_MY/files_versions.po
+++ b/l10n/ms_MY/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,10 +17,45 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index b9e4261b7a4..b04dd7bcb13 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -25,6 +25,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Ralat pengesahan"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr ""
@@ -49,10 +58,6 @@ msgstr "Emel tidak sah"
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Ralat pengesahan"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr ""
@@ -115,7 +120,7 @@ msgstr "Ralat"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Simpan..."
 
@@ -192,67 +197,83 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Kata laluan "
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Gagal mengubah kata laluan anda "
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Kata laluan semasa"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Kata laluan baru"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "Papar"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Ubah kata laluan"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Emel"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Alamat emel anda"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Isi alamat emel anda untuk membolehkan pemulihan kata laluan"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Bahasa"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Bantu terjemah"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -286,10 +307,6 @@ msgstr ""
 msgid "Other"
 msgstr "Lain"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index 7728f96e12c..5d5fac28738 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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -213,7 +213,7 @@ msgid "Use TLS"
 msgstr ""
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
 #: templates/settings.php:39
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 594697deef5..014392c6d21 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -57,8 +57,9 @@ msgid "No category to add?"
 msgstr "Ingen kategorier å legge til?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Denne kategorien finnes allerede:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -162,59 +163,59 @@ msgstr "November"
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 minutt siden"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutter siden"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "1 time siden"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{hours} timer siden"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} dager siden"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "forrige måned"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{months} måneder siden"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "måneder siden"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "forrige år"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "år siden"
 
@@ -473,7 +474,7 @@ msgstr "Rediger kategorier"
 msgid "Add"
 msgstr "Legg til"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Sikkerhetsadvarsel"
 
@@ -483,71 +484,75 @@ msgid ""
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr ""
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "opprett en <strong>administrator-konto</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Avansert"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Konfigurer databasen"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "vil bli brukt"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Databasebruker"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Databasepassord"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Databasenavn"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Database tabellområde"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Databasevert"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Fullfør oppsetting"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "nettjenester under din kontroll"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Logg ut"
 
@@ -569,14 +574,18 @@ msgstr "Vennligst skift passord for å gjøre kontoen din sikker igjen."
 msgid "Lost your password?"
 msgstr "Mistet passordet ditt?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "husk"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Logg inn"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "forrige"
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 195074affb1..832fb94d7bf 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -26,46 +26,60 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen filer ble lastet opp. Ukjent feil."
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Det er ingen feil. Filen ble lastet opp."
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Filstørrelsen overskrider maksgrensen på MAX_FILE_SIZE som ble oppgitt i HTML-skjemaet"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Filopplastningen ble bare delvis gjennomført"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Ingen fil ble lastet opp"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Mangler en midlertidig mappe"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Klarte ikke å skrive til disk"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -77,11 +91,15 @@ msgstr "Filer"
 msgid "Unshare"
 msgstr "Avslutt deling"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Slett"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Omdøp"
 
@@ -186,31 +204,31 @@ msgstr "URL-en kan ikke være tom."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Endret"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} filer"
 
diff --git a/l10n/nb_NO/files_trashbin.po b/l10n/nb_NO/files_trashbin.po
index bac182fb219..96d6a05b9de 100644
--- a/l10n/nb_NO/files_trashbin.po
+++ b/l10n/nb_NO/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Navn"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} filer"
 
diff --git a/l10n/nb_NO/files_versions.po b/l10n/nb_NO/files_versions.po
index 38f8fbe36fe..4441ba7870d 100644
--- a/l10n/nb_NO/files_versions.po
+++ b/l10n/nb_NO/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -19,10 +19,45 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Historie"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Fil versjonering"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index a3c72924251..f96018e1169 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -29,6 +29,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Lasting av liste fra App Store feilet."
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Autentikasjonsfeil"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Gruppen finnes allerede"
@@ -53,10 +62,6 @@ msgstr "Ugyldig epost"
 msgid "Unable to delete group"
 msgstr "Kan ikke slette gruppe"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Autentikasjonsfeil"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Kan ikke slette bruker"
@@ -119,7 +124,7 @@ msgstr "Feil"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Lagrer..."
 
@@ -196,67 +201,83 @@ msgstr "Last ned Android-klient"
 msgid "Download iOS Client"
 msgstr "Last ned iOS-klient"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Passord"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Passord har blitt endret"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Kunne ikke endre passordet ditt"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Nåværende passord"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Nytt passord"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "vis"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Endre passord"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Din e-postadresse"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Oppi epostadressen du vil tilbakestille passordet for"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Bidra til oversettelsen"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Versjon"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -290,10 +311,6 @@ msgstr ""
 msgid "Other"
 msgstr "Annet"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Gruppeadministrator"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 26b645f7673..6b6fa98ff04 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -214,8 +214,8 @@ msgid "Use TLS"
 msgstr "Bruk TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Ikke bruk for SSL tilkoblinger, dette vil ikke fungere."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 6f7635cbeb9..5200e7c3b07 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -21,9 +21,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 08:10+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,8 +64,9 @@ msgid "No category to add?"
 msgstr "Geen categorie toevoegen?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Deze categorie bestaat al."
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -169,59 +170,59 @@ msgstr "november"
 msgid "December"
 msgstr "december"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Instellingen"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "seconden geleden"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 minuut geleden"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuten geleden"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "1 uur geleden"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{hours} uren geleden"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "vandaag"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "gisteren"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} dagen geleden"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "vorige maand"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{months} maanden geleden"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "maanden geleden"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "vorig jaar"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "jaar geleden"
 
@@ -480,7 +481,7 @@ msgstr "Wijzigen categorieën"
 msgid "Add"
 msgstr "Toevoegen"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Beveiligingswaarschuwing"
 
@@ -490,71 +491,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Er kon geen willekeurig nummer worden gegenereerd. Zet de PHP OpenSSL extentie aan."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Zonder random nummer generator is het mogelijk voor een aanvaller om de reset tokens van wachtwoorden te voorspellen. Dit kan leiden tot het inbreken op uw account."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Uw data is waarschijnlijk toegankelijk vanaf net internet. Het  .htaccess bestand dat ownCloud levert werkt niet goed. U wordt aangeraden om de configuratie van uw webserver zodanig aan te passen dat de data folders niet meer publiekelijk toegankelijk zijn. U kunt ook de data folder verplaatsen naar een folder buiten de webserver document folder."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Maak een <strong>beheerdersaccount</strong> aan"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Gegevensmap"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Configureer de database"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "zal gebruikt worden"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Gebruiker database"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Wachtwoord database"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Naam database"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Database tablespace"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Database server"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Installatie afronden"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "Webdiensten in eigen beheer"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Afmelden"
 
@@ -576,14 +581,18 @@ msgstr "Wijzig uw wachtwoord zodat uw account weer beveiligd is."
 msgid "Lost your password?"
 msgstr "Uw wachtwoord vergeten?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "onthoud gegevens"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Meld je aan"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr "Alternatieve inlogs"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "vorige"
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index a49996ff6f2..b91face47ae 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -19,9 +19,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 08:10+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,46 +29,60 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Er was geen bestand geladen.  Onbekende fout"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Geen fout opgetreden, bestand successvol geupload."
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Het geüploade bestand overscheidt de upload_max_filesize optie in php.ini:"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Het geüploade bestand is groter dan de MAX_FILE_SIZE richtlijn die is opgegeven in de HTML-formulier"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Het bestand is slechts gedeeltelijk geupload"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Geen bestand geüpload"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Een tijdelijke map mist"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Schrijven naar schijf mislukt"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Niet genoeg ruimte beschikbaar"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Ongeldige directory."
 
@@ -80,11 +94,15 @@ msgstr "Bestanden"
 msgid "Unshare"
 msgstr "Stop delen"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr "Verwijder definitief"
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Verwijder"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Hernoem"
 
@@ -189,31 +207,31 @@ msgstr "URL kan niet leeg zijn."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud"
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Naam"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Bestandsgrootte"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Laatst aangepast"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 map"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} mappen"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 bestand"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} bestanden"
 
diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po
index 4aafb1900df..a138d9b3ae5 100644
--- a/l10n/nl/files_encryption.po
+++ b/l10n/nl/files_encryption.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# André Koot <meneer@tken.net>, 2013.
 # Lennart Weijl <lenny@weijl.org>, 2013.
 # Richard Bos <radoeka@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-08 00:09+0100\n"
+"PO-Revision-Date: 2013-02-07 13:50+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"
@@ -23,7 +24,7 @@ msgstr ""
 msgid ""
 "Please switch to your ownCloud client and change your encryption password to"
 " complete the conversion."
-msgstr ""
+msgstr "Schakel om naar uw eigen ownCloud client en wijzig uw versleutelwachtwoord om de conversie af te ronden."
 
 #: js/settings-personal.js:17
 msgid "switched to client side encryption"
@@ -47,15 +48,15 @@ msgstr "Versleuteling"
 
 #: templates/settings-personal.php:7
 msgid "File encryption is enabled."
-msgstr ""
+msgstr "Bestandsversleuteling geactiveerd."
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "De volgende bestandstypen zullen niet worden versleuteld:"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "Sluit de volgende bestandstypen uit van versleuteling:"
 
 #: templates/settings.php:12
 msgid "None"
diff --git a/l10n/nl/files_trashbin.po b/l10n/nl/files_trashbin.po
index 3c41fa7376a..fa20ea01287 100644
--- a/l10n/nl/files_trashbin.po
+++ b/l10n/nl/files_trashbin.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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,31 +18,45 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr "uitvoeren restore operatie"
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr "verwijder bestanden definitief"
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Naam"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr "Verwijderd"
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 map"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} mappen"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 bestand"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} bestanden"
 
diff --git a/l10n/nl/files_versions.po b/l10n/nl/files_versions.po
index 95169bacce0..106f784b914 100644
--- a/l10n/nl/files_versions.po
+++ b/l10n/nl/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Geschiedenis"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Bestand versies"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index e7ce8853525..2e6ae9ed37b 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 14:00+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"
@@ -32,6 +32,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Kan de lijst niet van de App store laden"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Authenticatie fout"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr "Kon de weergavenaam niet wijzigen"
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Groep bestaat al"
@@ -56,10 +65,6 @@ msgstr "Ongeldige e-mail"
 msgid "Unable to delete group"
 msgstr "Niet in staat om groep te verwijderen"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Authenticatie fout"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Niet in staat om gebruiker te verwijderen"
@@ -108,7 +113,7 @@ msgstr "Even geduld aub...."
 
 #: js/apps.js:84
 msgid "Updating...."
-msgstr ""
+msgstr "Bijwerken...."
 
 #: js/apps.js:87
 msgid "Error while updating app"
@@ -122,7 +127,7 @@ msgstr "Fout"
 msgid "Updated"
 msgstr "Bijgewerkt"
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Aan het bewaren....."
 
@@ -199,67 +204,83 @@ msgstr "Download Android Client"
 msgid "Download iOS Client"
 msgstr "Download iOS Client"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Je wachtwoord is veranderd"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Niet in staat om uw wachtwoord te wijzigen"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Huidig wachtwoord"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "weergeven"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Wijzig wachtwoord"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Weergavenaam"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr "Uw weergavenaam is gewijzigd"
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr "Kon de weergavenaam niet wijzigen"
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr "Wijzig weergavenaam"
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "E-mailadres"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Uw e-mailadres"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Vul een e-mailadres in om wachtwoord reset uit te kunnen voeren"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Taal"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Help met vertalen"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Gebruik dit adres om te verbinden met uw ownCloud in uw bestandsbeheer"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Versie"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -293,10 +314,6 @@ msgstr "Ongelimiteerd"
 msgid "Other"
 msgstr "Andere"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr "Weergavenaam"
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Groep beheerder"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index 16374f65707..bd1c87f11f0 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -32,7 +32,7 @@ msgstr "De configuratie is geldig en de verbinding is geslaagd!"
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr ""
+msgstr "De configuratie is geldig, maar Bind mislukte. Controleer de serverinstellingen en inloggegevens."
 
 #: ajax/testConfiguration.php:40
 msgid ""
@@ -175,7 +175,7 @@ msgstr "zonder een placeholder, bijv. \"objectClass=posixGroup\""
 
 #: templates/settings.php:31
 msgid "Connection Settings"
-msgstr ""
+msgstr "Verbindingsinstellingen"
 
 #: templates/settings.php:33
 msgid "Configuration Active"
@@ -183,7 +183,7 @@ msgstr "Configuratie actief"
 
 #: templates/settings.php:33
 msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "Als dit niet is ingeschakeld wordt deze configuratie overgeslagen."
 
 #: templates/settings.php:34
 msgid "Port"
@@ -197,7 +197,7 @@ msgstr "Backup (Replica) Host"
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
-msgstr ""
+msgstr "Opgeven optionele backup host. Het moet een replica van de hoofd LDAP/AD server."
 
 #: templates/settings.php:36
 msgid "Backup (Replica) Port"
@@ -216,8 +216,8 @@ msgid "Use TLS"
 msgstr "Gebruik TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Gebruik niet voor SSL connecties, deze mislukken."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
@@ -243,7 +243,7 @@ msgstr "in seconden. Een verandering maakt de cache leeg."
 
 #: templates/settings.php:43
 msgid "Directory Settings"
-msgstr ""
+msgstr "Mapinstellingen"
 
 #: templates/settings.php:45
 msgid "User Display Name Field"
@@ -263,7 +263,7 @@ msgstr "Een User Base DN per regel"
 
 #: templates/settings.php:47
 msgid "User Search Attributes"
-msgstr ""
+msgstr "Attributen voor gebruikerszoekopdrachten"
 
 #: templates/settings.php:47 templates/settings.php:50
 msgid "Optional; one attribute per line"
@@ -287,7 +287,7 @@ msgstr "Een Group Base DN per regel"
 
 #: templates/settings.php:50
 msgid "Group Search Attributes"
-msgstr ""
+msgstr "Attributen voor groepszoekopdrachten"
 
 #: templates/settings.php:51
 msgid "Group-Member association"
@@ -295,7 +295,7 @@ msgstr "Groepslid associatie"
 
 #: templates/settings.php:53
 msgid "Special Attributes"
-msgstr ""
+msgstr "Speciale attributen"
 
 #: templates/settings.php:56
 msgid "in bytes"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index e56d60adc1f..9146472fcc9 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -52,7 +52,8 @@ msgid "No category to add?"
 msgstr ""
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
+#, php-format
+msgid "This category already exists: %s"
 msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
@@ -157,59 +158,59 @@ msgstr "November"
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr ""
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr ""
 
@@ -468,7 +469,7 @@ msgstr ""
 msgid "Add"
 msgstr "Legg til"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr ""
 
@@ -478,71 +479,75 @@ msgid ""
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr ""
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Lag ein <strong>admin-konto</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Avansert"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Konfigurer databasen"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "vil bli nytta"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Databasebrukar"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Databasepassord"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Databasenamn"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Databasetenar"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Fullfør oppsettet"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "Vev tjenester under din kontroll"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Logg ut"
 
@@ -564,14 +569,18 @@ msgstr ""
 msgid "Lost your password?"
 msgstr "Gløymt passordet?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "hugs"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Logg inn"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "førre"
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index dd980f0277e..5ec5f461014 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.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-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -19,46 +19,60 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Ingen feil, fila vart lasta opp"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Den opplasta fila er større enn variabelen MAX_FILE_SIZE i HTML-skjemaet"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fila vart berre delvis lasta opp"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Ingen filer vart lasta opp"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Manglar ei mellombels mappe"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -70,11 +84,15 @@ msgstr "Filer"
 msgid "Unshare"
 msgstr ""
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Slett"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr ""
 
@@ -179,31 +197,31 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Storleik"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Endra"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po
index ef89f942345..ba74bb698bb 100644
--- a/l10n/nn_NO/files_trashbin.po
+++ b/l10n/nn_NO/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Namn"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/nn_NO/files_versions.po b/l10n/nn_NO/files_versions.po
index 3d20ded946a..3ed063fcb55 100644
--- a/l10n/nn_NO/files_versions.po
+++ b/l10n/nn_NO/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,10 +17,45 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 7c203200289..0d0f12e96e5 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -23,6 +23,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Klarer ikkje å laste inn liste fra App Store"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Feil i autentisering"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr ""
@@ -47,10 +56,6 @@ msgstr "Ugyldig e-postadresse"
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Feil i autentisering"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr ""
@@ -113,7 +118,7 @@ msgstr "Feil"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr ""
 
@@ -190,67 +195,83 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Passord"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Klarte ikkje å endra passordet"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Passord"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Nytt passord"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "vis"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Endra passord"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Epost"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Din epost addresse"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Fyll inn din e-post addresse for og kunne motta passord tilbakestilling"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Hjelp oss å oversett"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -284,10 +305,6 @@ msgstr ""
 msgid "Other"
 msgstr "Anna"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index a4e1c38181a..d2cf7889567 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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -213,7 +213,7 @@ msgid "Use TLS"
 msgstr ""
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
 #: templates/settings.php:39
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index 7e970870521..8860e32037b 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -51,8 +51,9 @@ msgid "No category to add?"
 msgstr "Pas de categoria d'ajustar ?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "La categoria exista ja :"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -156,59 +157,59 @@ msgstr "Novembre"
 msgid "December"
 msgstr "Decembre"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Configuracion"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "segonda a"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 minuta a"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "uèi"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "ièr"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "mes passat"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "meses  a"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "an passat"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "ans a"
 
@@ -467,7 +468,7 @@ msgstr "Edita categorias"
 msgid "Add"
 msgstr "Ajusta"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Avertiment de securitat"
 
@@ -477,71 +478,75 @@ msgid ""
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr ""
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>compte admin</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Avançat"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Dorsièr de donadas"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Configura la basa de donadas"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "serà utilizat"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Usancièr de la basa de donadas"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Senhal de la basa de donadas"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Nom de la basa de donadas"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Espandi de taula de basa de donadas"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Òste de basa de donadas"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Configuracion acabada"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "Services web jos ton contraròtle"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Sortida"
 
@@ -563,14 +568,18 @@ msgstr ""
 msgid "Lost your password?"
 msgstr "L'as perdut lo senhal ?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "bremba-te"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Dintrada"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "dariièr"
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index f7e8ceb4ea3..115f85f0fb1 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.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-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -18,46 +18,60 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Amontcargament capitat, pas d'errors"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Lo fichièr amontcargat es mai gròs que la directiva «MAX_FILE_SIZE» especifiada dins lo formulari HTML"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Lo fichièr foguèt pas completament amontcargat"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Cap de fichièrs son estats amontcargats"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Un dorsièr temporari manca"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "L'escriptura sul disc a fracassat"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -69,11 +83,15 @@ msgstr "Fichièrs"
 msgid "Unshare"
 msgstr "Non parteja"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Escafa"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Torna nomenar"
 
@@ -178,31 +196,31 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Talha"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/oc/files_trashbin.po b/l10n/oc/files_trashbin.po
index f558a70f109..064f9be30a7 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Nom"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/oc/files_versions.po b/l10n/oc/files_versions.po
index e8848887184..ed722b60222 100644
--- a/l10n/oc/files_versions.po
+++ b/l10n/oc/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,10 +17,45 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index 95c28b3ee25..2c3d180e393 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -22,6 +22,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Pas possible de cargar la tièra dempuèi App Store"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Error d'autentificacion"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Lo grop existís ja"
@@ -46,10 +55,6 @@ msgstr "Corrièl incorrècte"
 msgid "Unable to delete group"
 msgstr "Pas capable d'escafar un grop"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Error d'autentificacion"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Pas capable d'escafar un usancièr"
@@ -112,7 +117,7 @@ msgstr "Error"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Enregistra..."
 
@@ -189,67 +194,83 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Senhal"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Ton senhal a cambiat"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Pas possible de cambiar ton senhal"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Senhal en cors"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Senhal novèl"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "mòstra"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Cambia lo senhal"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Corrièl"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Ton adreiça de corrièl"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Emplena una adreiça de corrièl per permetre lo mandadís del senhal perdut"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Lenga"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Ajuda a la revirada"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -283,10 +304,6 @@ msgstr ""
 msgid "Other"
 msgstr "Autres"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grop Admin"
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index db410b6652d..56fd18cfc33 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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -213,7 +213,7 @@ msgid "Use TLS"
 msgstr ""
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
 #: templates/settings.php:39
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index d685740ac94..780d9e45d76 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -60,8 +60,9 @@ msgid "No category to add?"
 msgstr "Brak kategorii"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Ta kategoria już istnieje"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -165,59 +166,59 @@ msgstr "Listopad"
 msgid "December"
 msgstr "Grudzień"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "sekund temu"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 minute temu"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minut temu"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "1 godzine temu"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{hours} godzin temu"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "dziś"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} dni temu"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "ostani miesiąc"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{months} miesięcy temu"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "miesięcy temu"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "ostatni rok"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "lat temu"
 
@@ -476,7 +477,7 @@ msgstr "Edytuj kategorię"
 msgid "Add"
 msgstr "Dodaj"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Ostrzeżenie o zabezpieczeniach"
 
@@ -486,71 +487,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Niedostępny bezpieczny generator liczb losowych, należy włączyć rozszerzenie OpenSSL w PHP."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Bez bezpiecznego generatora liczb losowych, osoba atakująca może być w stanie przewidzieć resetujące hasło tokena i przejąć kontrolę nad swoim kontem."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Katalog danych (data) i pliki są prawdopodobnie dostępnego z Internetu. Sprawdź plik .htaccess oraz konfigurację serwera (hosta). Sugerujemy, skonfiguruj swój serwer w taki sposób, żeby dane katalogu nie były dostępne lub przenieść katalog danych spoza głównego dokumentu webserwera."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Tworzenie <strong>konta administratora</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Katalog danych"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Konfiguracja bazy danych"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "zostanie użyte"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Użytkownik bazy danych"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Hasło do bazy danych"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Nazwa bazy danych"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Obszar tabel bazy danych"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Komputer bazy danych"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Zakończ konfigurowanie"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "usługi internetowe pod kontrolą"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Wylogowuje użytkownika"
 
@@ -572,14 +577,18 @@ msgstr "Proszę zmienić swoje hasło, aby zabezpieczyć swoje konto ponownie."
 msgid "Lost your password?"
 msgstr "Nie pamiętasz hasła?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "Zapamiętanie"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Zaloguj"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "wstecz"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index b6554c153a8..74de66a0d41 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -25,46 +25,60 @@ 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/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Plik nie został załadowany. Nieznany błąd"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Przesłano plik"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Wgrany plik przekracza wartość upload_max_filesize zdefiniowaną w php.ini: "
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Rozmiar przesłanego pliku przekracza maksymalną wartość dyrektywy upload_max_filesize, zawartą formularzu HTML"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Plik przesłano tylko częściowo"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Nie przesłano żadnego pliku"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Brak katalogu tymczasowego"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Błąd zapisu na dysk"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Za mało miejsca"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Zła ścieżka."
 
@@ -76,11 +90,15 @@ msgstr "Pliki"
 msgid "Unshare"
 msgstr "Nie udostępniaj"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Usuwa element"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Zmień nazwę"
 
@@ -185,31 +203,31 @@ msgstr "URL nie może być pusty."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nazwa folderu nieprawidłowa. Wykorzystanie \"Shared\" jest zarezerwowane przez Owncloud"
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Nazwa"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Rozmiar"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Czas modyfikacji"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} foldery"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 plik"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} pliki"
 
diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po
index 748f62eaace..3f85b77dcc2 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ 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"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Nazwa"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} foldery"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 plik"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} pliki"
 
diff --git a/l10n/pl/files_versions.po b/l10n/pl/files_versions.po
index a2020d78f2d..4d5b44af343 100644
--- a/l10n/pl/files_versions.po
+++ b/l10n/pl/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -19,10 +19,45 @@ 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/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Historia"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Wersjonowanie plików"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index ffae537e261..7849faf3679 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -32,6 +32,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Nie mogę załadować listy aplikacji"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Błąd uwierzytelniania"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Grupa już istnieje"
@@ -56,10 +65,6 @@ msgstr "Niepoprawny email"
 msgid "Unable to delete group"
 msgstr "Nie można usunąć grupy"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Błąd uwierzytelniania"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Nie można usunąć użytkownika"
@@ -122,7 +127,7 @@ msgstr "Błąd"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Zapisywanie..."
 
@@ -199,67 +204,83 @@ msgstr "Pobierz klienta dla Androida"
 msgid "Download iOS Client"
 msgstr "Pobierz klienta dla iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Hasło"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Twoje hasło zostało zmienione"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Nie można zmienić hasła"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Bieżące hasło"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "Wyświetlanie"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Zmień hasło"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Adres e-mail użytkownika"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Proszę wprowadzić adres e-mail, aby uzyskać możliwość odzyskania hasła"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Język"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Pomóż w tłumaczeniu"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Użyj tego adresu aby podłączyć zasób ownCloud w menedżerze plików"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Wersja"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -293,10 +314,6 @@ msgstr "Bez limitu"
 msgid "Other"
 msgstr "Inne"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grupa Admin"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index 1e8b58da0e5..375849b6dc2 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -216,8 +216,8 @@ msgid "Use TLS"
 msgstr "Użyj TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Nie używaj SSL dla połączeń, jeśli się nie powiedzie."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/pl_PL/core.po b/l10n/pl_PL/core.po
index 7f8272bc084..fd6666ba2dd 100644
--- a/l10n/pl_PL/core.po
+++ b/l10n/pl_PL/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-01-30 00:23+0100\n"
-"PO-Revision-Date: 2013-01-29 23:23+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -50,7 +50,8 @@ msgid "No category to add?"
 msgstr ""
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
+#, php-format
+msgid "This category already exists: %s"
 msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
@@ -155,59 +156,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
+#: js/js.js:284
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:762
+#: js/js.js:764
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:763
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:765
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:766
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:769
 msgid "today"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:770
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:772
 msgid "last month"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:774
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:773
+#: js/js.js:775
 msgid "last year"
 msgstr ""
 
-#: js/js.js:774
+#: js/js.js:776
 msgid "years ago"
 msgstr ""
 
@@ -466,7 +467,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr ""
 
@@ -476,71 +477,75 @@ msgid ""
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr ""
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:32
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr ""
 
@@ -562,14 +567,18 @@ msgstr ""
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr ""
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr ""
diff --git a/l10n/pl_PL/files.po b/l10n/pl_PL/files.po
index ab00380cb6b..19de2c06401 100644
--- a/l10n/pl_PL/files.po
+++ b/l10n/pl_PL/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-01-31 17:02+0100\n"
-"PO-Revision-Date: 2013-01-31 16:02+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -17,46 +17,60 @@ msgstr ""
 "Language: pl_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/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -68,11 +82,15 @@ msgstr ""
 msgid "Unshare"
 msgstr ""
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr ""
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr ""
 
@@ -177,31 +195,31 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/pl_PL/files_trashbin.po b/l10n/pl_PL/files_trashbin.po
index ce226803d8a..d35b236c8f8 100644
--- a/l10n/pl_PL/files_trashbin.po
+++ b/l10n/pl_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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -17,31 +17,45 @@ msgstr ""
 "Language: pl_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"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/pl_PL/files_versions.po b/l10n/pl_PL/files_versions.po
index 38bf131e3e4..4423dd3512d 100644
--- a/l10n/pl_PL/files_versions.po
+++ b/l10n/pl_PL/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,45 @@ msgstr ""
 "Language: pl_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/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/pl_PL/settings.po b/l10n/pl_PL/settings.po
index f95716114e3..991c4808c5b 100644
--- a/l10n/pl_PL/settings.po
+++ b/l10n/pl_PL/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr ""
@@ -45,10 +54,6 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr ""
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr ""
@@ -111,7 +116,7 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr ""
 
@@ -188,67 +193,83 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr ""
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -282,10 +303,6 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
diff --git a/l10n/pl_PL/user_ldap.po b/l10n/pl_PL/user_ldap.po
index 1b11dc6b24e..6fecd479fb5 100644
--- a/l10n/pl_PL/user_ldap.po
+++ b/l10n/pl_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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -213,7 +213,7 @@ msgid "Use TLS"
 msgstr ""
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
 #: templates/settings.php:39
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 6a49a47bbd4..bf4e2100d62 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
-"Last-Translator: rodrigost23 <rodrigo.st23@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -61,8 +61,9 @@ msgid "No category to add?"
 msgstr "Nenhuma categoria adicionada?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Essa categoria já existe"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -166,59 +167,59 @@ msgstr "Novembro"
 msgid "December"
 msgstr "Dezembro"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Configurações"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 minuto atrás"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutos atrás"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "1 hora atrás"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{hours} horas atrás"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "hoje"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} dias atrás"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "último mês"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{months} meses atrás"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "último ano"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "anos atrás"
 
@@ -477,7 +478,7 @@ msgstr "Editar categorias"
 msgid "Add"
 msgstr "Adicionar"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Aviso de Segurança"
 
@@ -487,71 +488,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Nenhum gerador de número aleatório de segurança disponível. Habilite a extensão OpenSSL do PHP."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Sem um gerador de número aleatório de segurança, um invasor pode ser capaz de prever os símbolos de redefinição de senhas e assumir sua conta."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Seu diretório de dados e seus arquivos estão, provavelmente, acessíveis a partir da internet. O .htaccess que o ownCloud fornece não está funcionando. Nós sugerimos que você configure o seu servidor web de uma forma que o diretório de dados esteja mais acessível ou que você mova o diretório de dados para fora da raiz do servidor web."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Criar uma <strong>conta</strong> de <strong>administrador</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Avançado"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Pasta de dados"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Configurar o banco de dados"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "será usado"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Usuário de banco de dados"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Senha do banco de dados"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Nome do banco de dados"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Espaço de tabela do banco de dados"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Banco de dados do host"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Concluir configuração"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "web services sob seu controle"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Sair"
 
@@ -573,14 +578,18 @@ msgstr "Por favor troque sua senha para tornar sua conta segura novamente."
 msgid "Lost your password?"
 msgstr "Esqueçeu sua senha?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "lembrete"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Log in"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "anterior"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index c00ceb550f5..a1270334a2b 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -26,46 +26,60 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Nenhum arquivo foi transferido. Erro desconhecido"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Não houve nenhum erro, o arquivo foi transferido com sucesso"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "O arquivo enviado excede a diretiva upload_max_filesize no php.ini: "
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "O arquivo carregado excede o MAX_FILE_SIZE que foi especificado no formulário HTML"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "O arquivo foi transferido parcialmente"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Nenhum arquivo foi transferido"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Pasta temporária não encontrada"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Falha ao escrever no disco"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Diretório inválido."
 
@@ -77,11 +91,15 @@ msgstr "Arquivos"
 msgid "Unshare"
 msgstr "Descompartilhar"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Excluir"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Renomear"
 
@@ -186,31 +204,31 @@ msgstr "URL não pode ficar em branco"
 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:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 arquivo"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} arquivos"
 
diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po
index c6586d1029b..785b8eddbe5 100644
--- a/l10n/pt_BR/files_trashbin.po
+++ b/l10n/pt_BR/files_trashbin.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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,31 +18,45 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr "realizar operação de restauração"
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Nome"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr "Excluído"
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 arquivo"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} arquivos"
 
diff --git a/l10n/pt_BR/files_versions.po b/l10n/pt_BR/files_versions.po
index d6cf483ba38..d47f04d6cfb 100644
--- a/l10n/pt_BR/files_versions.po
+++ b/l10n/pt_BR/files_versions.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-01-31 00:27+0100\n"
-"PO-Revision-Date: 2013-01-30 15:50+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -19,10 +19,45 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Histórico"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Versionamento de Arquivos"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 7b1b23da58a..de48363261e 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -31,6 +31,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Não foi possível carregar lista da App Store"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Erro de autenticação"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Grupo já existe"
@@ -55,10 +64,6 @@ msgstr "E-mail inválido"
 msgid "Unable to delete group"
 msgstr "Não foi possível remover grupo"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Erro de autenticação"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Não foi possível remover usuário"
@@ -121,7 +126,7 @@ msgstr "Erro"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Guardando..."
 
@@ -198,67 +203,83 @@ msgstr "Baixar Cliente Android"
 msgid "Download iOS Client"
 msgstr "Baixar Cliente iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Senha"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Sua senha foi alterada"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Não é possivel alterar a sua senha"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Senha atual"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Nova senha"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "mostrar"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Alterar senha"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Nome de Exibição"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Seu endereço de e-mail"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Preencha um endereço de e-mail para habilitar a recuperação de senha"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Ajude a traduzir"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Usar este endereço para conectar-se ao seu ownCloud no seu gerenciador de arquivos"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Versão"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -292,10 +313,6 @@ msgstr "Ilimitado"
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr "Nome de Exibição"
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grupo Administrativo"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index 7c537702150..6abc8f57af7 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -214,8 +214,8 @@ msgid "Use TLS"
 msgstr "Usar TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Não use-o para conexões SSL, pois falhará."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 2c30f25b723..720a1bc3a2e 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -8,16 +8,16 @@
 #  <duartegrilo@gmail.com>, 2013.
 # Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
 #   <helder.meneses@gmail.com>, 2011, 2012.
-# Helder Meneses <helder.meneses@gmail.com>, 2012.
+# Helder Meneses <helder.meneses@gmail.com>, 2012-2013.
 # Nelson Rosado <nelsontrosado@gmail.com>, 2012.
 #   <rjgpp.1994@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
-"Last-Translator: Duarte Velez Grilo <duartegrilo@gmail.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,8 +58,9 @@ msgid "No category to add?"
 msgstr "Nenhuma categoria para adicionar?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Esta categoria já existe:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -163,59 +164,59 @@ msgstr "Novembro"
 msgid "December"
 msgstr "Dezembro"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Definições"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "Minutos atrás"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "Há 1 minuto"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutos atrás"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "Há 1 hora"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "Há {hours} horas atrás"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "hoje"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} dias atrás"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "ultímo mês"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "Há {months} meses atrás"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "ano passado"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "anos atrás"
 
@@ -474,7 +475,7 @@ msgstr "Editar categorias"
 msgid "Add"
 msgstr "Adicionar"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Aviso de Segurança"
 
@@ -484,71 +485,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Não existe nenhum gerador seguro de números aleatórios, por favor, active a extensão OpenSSL no PHP."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Sem nenhum gerador seguro de números aleatórios, uma pessoa mal intencionada pode prever a sua password, reiniciar as seguranças adicionais e tomar conta da sua conta. "
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "A sua pasta com os dados e os seus ficheiros estão provavelmente acessíveis a partir das internet. Sugerimos veementemente que configure o seu servidor web de maneira a que a pasta com os dados deixe de ficar acessível, ou mova a pasta com os dados para fora da raiz de documentos do servidor web."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Criar uma <strong>conta administrativa</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Avançado"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Pasta de dados"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Configure a base de dados"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "vai ser usada"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Utilizador da base de dados"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Password da base de dados"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Nome da base de dados"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Tablespace da base de dados"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Anfitrião da base de dados"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Acabar instalação"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "serviços web sob o seu controlo"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Sair"
 
@@ -570,14 +575,18 @@ msgstr "Por favor mude a sua palavra-passe para assegurar a sua conta de novo."
 msgid "Lost your password?"
 msgstr "Esqueceu-se da sua password?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "lembrar"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Entrar"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr "Contas de acesso alternativas"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "anterior"
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 70714ed855d..4f3a80d9f70 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -8,16 +8,16 @@
 #  <duartegrilo@gmail.com>, 2013.
 # Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
 #   <geral@ricardolameiro.pt>, 2012.
-# Helder Meneses <helder.meneses@gmail.com>, 2012.
+# Helder Meneses <helder.meneses@gmail.com>, 2012-2013.
 # Miguel Sousa <migueljorgesousa@sapo.pt>, 2013.
 #   <rjgpp.1994@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 02:40+0000\n"
-"Last-Translator: Mouxy <daniel@mouxy.net>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,46 +25,60 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Nenhum ficheiro foi carregado. Erro desconhecido"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Sem erro, ficheiro enviado com sucesso"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "O ficheiro enviado excede o limite permitido na directiva do php.ini upload_max_filesize"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "O ficheiro enviado excede o diretivo MAX_FILE_SIZE especificado no formulário HTML"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "O ficheiro enviado só foi enviado parcialmente"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Não foi enviado nenhum ficheiro"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Falta uma pasta temporária"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Falhou a escrita no disco"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Espaço em disco insuficiente!"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Directório Inválido"
 
@@ -76,11 +90,15 @@ msgstr "Ficheiros"
 msgid "Unshare"
 msgstr "Deixar de partilhar"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr "Eliminar permanentemente"
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Apagar"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Renomear"
 
@@ -185,31 +203,31 @@ msgstr "O URL não pode estar vazio."
 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:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} ficheiros"
 
diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po
index 3ff3c4b6238..5f79fd32069 100644
--- a/l10n/pt_PT/files_trashbin.po
+++ b/l10n/pt_PT/files_trashbin.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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 02:40+0000\n"
-"Last-Translator: Mouxy <daniel@mouxy.net>\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,31 +18,45 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr "Restaurar"
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Nome"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr "Apagado"
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} ficheiros"
 
diff --git a/l10n/pt_PT/files_versions.po b/l10n/pt_PT/files_versions.po
index 596deab4396..48cc4e4416c 100644
--- a/l10n/pt_PT/files_versions.po
+++ b/l10n/pt_PT/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Histórico"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Versionamento de Ficheiros"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 9071ca3e16c..8c1833afc0e 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 02:40+0000\n"
-"Last-Translator: Mouxy <daniel@mouxy.net>\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,6 +29,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Incapaz de carregar a lista da App Store"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Erro de autenticação"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "O grupo já existe"
@@ -53,10 +62,6 @@ msgstr "Email inválido"
 msgid "Unable to delete group"
 msgstr "Impossível apagar grupo"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Erro de autenticação"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Impossível apagar utilizador"
@@ -119,7 +124,7 @@ msgstr "Erro"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "A guardar..."
 
@@ -196,67 +201,83 @@ msgstr "Transferir o cliente android"
 msgid "Download iOS Client"
 msgstr "Transferir o cliente iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Palavra-chave"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "A sua palavra-passe foi alterada"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Não foi possivel alterar a sua palavra-chave"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Palavra-chave actual"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Nova palavra-chave"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "mostrar"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Alterar palavra-chave"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Nome público"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "endereço de email"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "O seu endereço de email"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Preencha com o seu endereço de email para ativar a recuperação da palavra-chave"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Ajude a traduzir"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Use este endereço no seu gestor de ficheiros para ligar à sua ownCloud"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Versão"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -290,10 +311,6 @@ msgstr "Ilimitado"
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr "Nome público"
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grupo Administrador"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 66e002ab89e..643d61ad73a 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -6,14 +6,14 @@
 #   <daniel@mouxy.net>, 2012-2013.
 # Daniel Pinto <daniel@mouxy.net>, 2013.
 # Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
-# Helder Meneses <helder.meneses@gmail.com>, 2012.
+# Helder Meneses <helder.meneses@gmail.com>, 2012-2013.
 # Nelson Rosado <nelsontrosado@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -177,7 +177,7 @@ msgstr "Sem nenhuma variável. Exemplo: \"objectClass=posixGroup\"."
 
 #: templates/settings.php:31
 msgid "Connection Settings"
-msgstr ""
+msgstr "Definições de ligação"
 
 #: templates/settings.php:33
 msgid "Configuration Active"
@@ -218,8 +218,8 @@ msgid "Use TLS"
 msgstr "Usar TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Não use para ligações SSL, irá falhar."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
@@ -245,7 +245,7 @@ msgstr "em segundos. Uma alteração esvazia a cache."
 
 #: templates/settings.php:43
 msgid "Directory Settings"
-msgstr ""
+msgstr "Definições de directorias"
 
 #: templates/settings.php:45
 msgid "User Display Name Field"
@@ -297,7 +297,7 @@ msgstr "Associar utilizador ao grupo."
 
 #: templates/settings.php:53
 msgid "Special Attributes"
-msgstr ""
+msgstr "Atributos especiais"
 
 #: templates/settings.php:56
 msgid "in bytes"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 65658de58b3..ef9d59ed883 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -56,8 +56,9 @@ msgid "No category to add?"
 msgstr "Nici o categorie de adăugat?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Această categorie deja există:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -161,59 +162,59 @@ msgstr "Noiembrie"
 msgid "December"
 msgstr "Decembrie"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Configurări"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "secunde în urmă"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 minut în urmă"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minute in urma"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "Acum o ora"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{hours} ore în urmă"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "astăzi"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} zile in urma"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "ultima lună"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{months} luni în urmă"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "luni în urmă"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "ultimul an"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "ani în urmă"
 
@@ -472,7 +473,7 @@ msgstr "Editează categoriile"
 msgid "Add"
 msgstr "Adaugă"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Avertisment de securitate"
 
@@ -482,71 +483,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Generatorul de numere pentru securitate nu este disponibil, va rog activati extensia PHP OpenSSL"
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Fara generatorul pentru numere de securitate , un atacator poate afla parola si reseta contul tau"
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Directorul tău de date și fișierele tale probabil sunt accesibile prin internet. Fișierul .htaccess oferit de ownCloud nu funcționează. Îți recomandăm să configurezi server-ul tău web într-un mod în care directorul de date să nu mai fie accesibil sau mută directorul de date în afara directorului root al server-ului web."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crează un <strong>cont de administrator</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Avansat"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Director date"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Configurează baza de date"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "vor fi folosite"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Utilizatorul bazei de date"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Parola bazei de date"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Numele bazei de date"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Tabela de spațiu a bazei de date"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Bază date"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Finalizează instalarea"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "servicii web controlate de tine"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Ieșire"
 
@@ -568,14 +573,18 @@ msgstr "Te rog schimba parola pentru ca, contul tau sa fie securizat din nou."
 msgid "Lost your password?"
 msgstr "Ai uitat parola?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "amintește"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Autentificare"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "precedentul"
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index e6df42f7c71..5cb6516a737 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -23,46 +23,60 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Nici un fișier nu a fost încărcat. Eroare necunoscută"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Nicio eroare, fișierul a fost încărcat cu succes"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Fisierul incarcat depaseste upload_max_filesize permisi in php.ini: "
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Fișierul are o dimensiune mai mare decât variabile MAX_FILE_SIZE specificată în formularul HTML"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fișierul a fost încărcat doar parțial"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Niciun fișier încărcat"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Lipsește un dosar temporar"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Eroare la scriere pe disc"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Nu este suficient spațiu disponibil"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Director invalid."
 
@@ -74,11 +88,15 @@ msgstr "Fișiere"
 msgid "Unshare"
 msgstr "Anulează partajarea"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Șterge"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Redenumire"
 
@@ -183,31 +201,31 @@ msgstr "Adresa URL nu poate fi goală."
 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:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Nume"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Dimensiune"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} foldare"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 fisier"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} fisiere"
 
diff --git a/l10n/ro/files_trashbin.po b/l10n/ro/files_trashbin.po
index 180def499df..252b8a0e7d8 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Nume"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} foldare"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 fisier"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} fisiere"
 
diff --git a/l10n/ro/files_versions.po b/l10n/ro/files_versions.po
index 28514d6ddd3..46715013ca3 100644
--- a/l10n/ro/files_versions.po
+++ b/l10n/ro/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Istoric"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Versionare fișiere"
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index e538f042146..a54bf6ea81f 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -28,6 +28,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Imposibil de încărcat lista din App Store"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Eroare de autentificare"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Grupul există deja"
@@ -52,10 +61,6 @@ msgstr "E-mail nevalid"
 msgid "Unable to delete group"
 msgstr "Nu s-a putut șterge grupul"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Eroare de autentificare"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Nu s-a putut șterge utilizatorul"
@@ -118,7 +123,7 @@ msgstr "Eroare"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Salvez..."
 
@@ -195,67 +200,83 @@ msgstr "Descarcă client Android"
 msgid "Download iOS Client"
 msgstr "Descarcă client iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Parolă"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Parola a fost modificată"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Imposibil de-ați schimbat parola"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Parola curentă"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Noua parolă"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "afișează"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Schimbă parola"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Adresa ta de email"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Completează o adresă de mail pentru a-ți putea recupera parola"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Limba"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Ajută la traducere"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Folosește această adresă pentru a conecta ownCloud cu managerul de fișiere"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Versiunea"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -289,10 +310,6 @@ msgstr "Nelimitată"
 msgid "Other"
 msgstr "Altele"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grupul Admin "
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 388d6f13f21..4a97d1b7d6a 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -216,8 +216,8 @@ msgid "Use TLS"
 msgstr "Utilizează TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "A nu se utiliza pentru conexiuni SSL, va eșua."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index d7d104fdf6b..f41a1f241b9 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -8,17 +8,19 @@
 #   <k0ldbl00d@gmail.com>, 2012.
 # Mihail Vasiliev <mickvav@gmail.com>, 2012.
 #   <semen@sam002.net>, 2012.
+# Sergey <sergey@markevich.ru>, 2013.
 #   <sharov3@gmail.com>, 2013.
 #   <skoptev@ukr.net>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 # Victor Bravo <>, 2012.
 #   <victor.dubiniuk@gmail.com>, 2012.
+# Дмитрий <langaru@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -60,8 +62,9 @@ msgid "No category to add?"
 msgstr "Нет категорий для добавления?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Эта категория уже существует: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr "Эта категория уже существует: %s"
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -165,59 +168,59 @@ msgstr "Ноябрь"
 msgid "December"
 msgstr "Декабрь"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "несколько секунд назад"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 минуту назад"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} минут назад"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "час назад"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{hours} часов назад"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "сегодня"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} дней назад"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "в прошлом месяце"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{months} месяцев назад"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "несколько месяцев назад"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "в прошлом году"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "несколько лет назад"
 
@@ -266,7 +269,7 @@ msgstr "Открыть доступ"
 
 #: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
 msgid "Shared"
-msgstr ""
+msgstr "Общие"
 
 #: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
@@ -389,11 +392,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 ""
+msgstr "При обновлении произошла ошибка. Пожалуйста сообщите об этом в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud сообщество</a>."
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud..."
 
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
@@ -476,7 +479,7 @@ msgstr "Редактировать категории"
 msgid "Add"
 msgstr "Добавить"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Предупреждение безопасности"
 
@@ -486,71 +489,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Нет доступного защищенного генератора случайных чисел, пожалуйста, включите расширение PHP OpenSSL."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Без защищенного генератора случайных чисел злоумышленник может предугадать токены сброса пароля и завладеть Вашей учетной записью."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Ваши каталоги данных и файлы, вероятно, доступны из Интернета. Файл .htaccess, предоставляемый ownCloud, не работает. Мы настоятельно рекомендуем Вам настроить вебсервер таким образом, чтобы каталоги данных больше не были доступны, или переместить их за пределы корневого каталога документов веб-сервера."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Создать <strong>учётную запись администратора</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Директория с данными"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Настройка базы данных"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "будет использовано"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Имя пользователя для базы данных"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Пароль для базы данных"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Название базы данных"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Табличое пространство базы данных"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Хост базы данных"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Завершить установку"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "Сетевые службы под твоим контролем"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Выйти"
 
@@ -572,14 +579,18 @@ msgstr "Пожалуйста, смените пароль, чтобы обезо
 msgid "Lost your password?"
 msgstr "Забыли пароль?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "запомнить"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Войти"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr "Альтернативные имена пользователя"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "пред"
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 63ecf244040..bbb67c0ef4a 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -9,17 +9,19 @@
 #   <mpolr21@gmail.com>, 2012.
 # Nick Remeslennikov <homolibere@gmail.com>, 2012.
 #   <semen@sam002.net>, 2012.
+# Sergey <sergey@markevich.ru>, 2013.
 #   <sharov3@gmail.com>, 2013.
 #   <skoptev@ukr.net>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 # Victor Bravo <>, 2012.
 #   <victor.dubiniuk@gmail.com>, 2012.
+# Дмитрий <langaru@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -28,46 +30,60 @@ 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/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Файл не был загружен. Неизвестная ошибка"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Файл успешно загружен"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Файл превышает размер установленный upload_max_filesize в php.ini:"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Файл превышает размер MAX_FILE_SIZE, указаный в HTML-форме"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Файл был загружен не полностью"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Файл не был загружен"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Невозможно найти временную папку"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Ошибка записи на диск"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Недостаточно свободного места"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Неправильный каталог."
 
@@ -79,11 +95,15 @@ msgstr "Файлы"
 msgid "Unshare"
 msgstr "Отменить публикацию"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr "Удалено навсегда"
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Удалить"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Переименовать"
 
@@ -117,7 +137,7 @@ msgstr "заменено {new_name} на {old_name}"
 
 #: js/filelist.js:280
 msgid "perform delete operation"
-msgstr ""
+msgstr "выполняется операция удаления"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -135,17 +155,17 @@ 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 ""
+msgstr "Ваше хранилище почти заполнено ({usedSpacePercent}%)"
 
 #: js/files.js:224
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr ""
+msgstr "Загрузка началась. Это может потребовать много времени, если файл большого размера."
 
 #: js/files.js:261
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
@@ -188,31 +208,31 @@ msgstr "Ссылка не может быть пустой."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано."
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Название"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Изменён"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} папок"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} файлов"
 
@@ -270,7 +290,7 @@ msgstr "Из ссылки"
 
 #: templates/index.php:40
 msgid "Trash"
-msgstr ""
+msgstr "Корзина"
 
 #: templates/index.php:46
 msgid "Cancel upload"
@@ -304,4 +324,4 @@ msgstr "Текущее сканирование"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "Обновление кеша файловой системы..."
diff --git a/l10n/ru/files_encryption.po b/l10n/ru/files_encryption.po
index b9f437eee8c..4f23cda8f69 100644
--- a/l10n/ru/files_encryption.po
+++ b/l10n/ru/files_encryption.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Denis  <reg.transifex.net@demitel.ru>, 2012.
+# Дмитрий <langaru@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 06:40+0000\n"
+"Last-Translator: Langaru <langaru@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,23 +23,23 @@ msgstr ""
 msgid ""
 "Please switch to your ownCloud client and change your encryption password to"
 " complete the conversion."
-msgstr ""
+msgstr "Пожалуйста переключитесь на Ваш клиент ownCloud и поменяйте пароль шиврования для завершения преобразования."
 
 #: js/settings-personal.js:17
 msgid "switched to client side encryption"
-msgstr ""
+msgstr "переключён на шифрование со стороны клиента"
 
 #: js/settings-personal.js:21
 msgid "Change encryption password to login password"
-msgstr ""
+msgstr "Изменить пароль шифрования для пароля входа"
 
 #: js/settings-personal.js:25
 msgid "Please check your passwords and try again."
-msgstr ""
+msgstr "Пожалуйста проверьте пароли и попробуйте снова."
 
 #: js/settings-personal.js:25
 msgid "Could not change your file encryption password to your login password"
-msgstr ""
+msgstr "Невозможно изменить Ваш пароль файла шифрования для пароля входа"
 
 #: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
@@ -46,15 +47,15 @@ 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"
diff --git a/l10n/ru/files_trashbin.po b/l10n/ru/files_trashbin.po
index b208ca663da..2da2f61dbc1 100644
--- a/l10n/ru/files_trashbin.po
+++ b/l10n/ru/files_trashbin.po
@@ -3,13 +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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 04:50+0000\n"
+"Last-Translator: Langaru <langaru@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +18,52 @@ 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"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr "%s не может быть удалён навсегда"
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr "%s не может быть восстановлен"
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
-msgstr ""
+msgstr "выполнить операцию восстановления"
+
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr "удалить файл навсегда"
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Имя"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
-msgstr ""
+msgstr "Удалён"
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} папок"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} файлов"
 
 #: 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 "Восстановить"
diff --git a/l10n/ru/files_versions.po b/l10n/ru/files_versions.po
index e25aa41375a..87dce55db7e 100644
--- a/l10n/ru/files_versions.po
+++ b/l10n/ru/files_versions.po
@@ -6,13 +6,14 @@
 # Denis  <reg.transifex.net@demitel.ru>, 2012.
 #   <skoptev@ukr.net>, 2012.
 #   <victor.dubiniuk@gmail.com>, 2012.
+# Дмитрий <langaru@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 06:30+0000\n"
+"Last-Translator: Langaru <langaru@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,10 +21,45 @@ 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/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr "Не может быть возвращён: %s"
+
+#: history.php:40
+msgid "success"
+msgstr "успех"
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr "Файл %s был возвращён к версии %s"
+
+#: history.php:49
+msgid "failure"
+msgstr "провал"
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr "Файл %s не может быть возвращён к версии %s"
+
+#: history.php:68
+msgid "No old versions available"
+msgstr "Нет доступных старых версий"
+
+#: history.php:73
+msgid "No path specified"
+msgstr "Путь не указан"
+
 #: js/versions.js:16
 msgid "History"
 msgstr "История"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr "Вернуть файл к предыдущей версии нажатием на кнопку возврата"
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Версии файлов"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index 3426bc61722..f834d506e21 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -7,14 +7,15 @@
 #   <k0ldbl00d@gmail.com>, 2012.
 # Mihail Vasiliev <mickvav@gmail.com>, 2012.
 #   <mpolr21@gmail.com>, 2012.
+# Sergey <sergey@markevich.ru>, 2013.
 #   <victor.dubiniuk@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-17 00:26+0100\n"
-"PO-Revision-Date: 2013-01-16 23:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 07:20+0000\n"
+"Last-Translator: m4rkell <sergey@markevich.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,49 +23,49 @@ 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"
 
-#: app.php:301
+#: app.php:313
 msgid "Help"
 msgstr "Помощь"
 
-#: app.php:308
+#: app.php:320
 msgid "Personal"
 msgstr "Личное"
 
-#: app.php:313
+#: app.php:325
 msgid "Settings"
 msgstr "Настройки"
 
-#: app.php:318
+#: app.php:330
 msgid "Users"
 msgstr "Пользователи"
 
-#: app.php:325
+#: app.php:337
 msgid "Apps"
 msgstr "Приложения"
 
-#: app.php:327
+#: app.php:339
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:365
+#: files.php:202
 msgid "ZIP download is turned off."
 msgstr "ZIP-скачивание отключено."
 
-#: files.php:366
+#: files.php:203
 msgid "Files need to be downloaded one by one."
 msgstr "Файлы должны быть загружены по одному."
 
-#: files.php:366 files.php:391
+#: files.php:203 files.php:228
 msgid "Back to Files"
 msgstr "Назад к файлам"
 
-#: files.php:390
+#: files.php:227
 msgid "Selected files too large to generate zip file."
 msgstr "Выбранные файлы слишком велики, чтобы создать zip файл."
 
-#: helper.php:228
+#: helper.php:226
 msgid "couldn't be determined"
-msgstr ""
+msgstr "Невозможно установить"
 
 #: json.php:28
 msgid "Application is not enabled"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 489a9f51c77..b0831ab57ab 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -10,18 +10,20 @@
 # Nick Remeslennikov <homolibere@gmail.com>, 2012.
 #   <rasperepodvipodvert@gmail.com>, 2012.
 #   <semen@sam002.net>, 2012.
+# Sergey <sergey@markevich.ru>, 2013.
 #   <sharov3@gmail.com>, 2012-2013.
 #   <skoptev@ukr.net>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 # Victor Bravo <>, 2012.
 #   <victor.dubiniuk@gmail.com>, 2012.
+# Дмитрий <langaru@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 07:10+0000\n"
+"Last-Translator: Langaru <langaru@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,6 +35,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Загрузка из App Store запрещена"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Ошибка авторизации"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr "Невозможно изменить отображаемое имя"
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Группа уже существует"
@@ -57,10 +68,6 @@ msgstr "Неправильный Email"
 msgid "Unable to delete group"
 msgstr "Невозможно удалить группу"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Ошибка авторизации"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Невозможно удалить пользователя"
@@ -89,11 +96,11 @@ msgstr "Невозможно удалить пользователя из гру
 
 #: ajax/updateapp.php:13
 msgid "Couldn't update app."
-msgstr ""
+msgstr "Невозможно обновить приложение"
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
-msgstr ""
+msgstr "Обновить до {версия приложения}"
 
 #: js/apps.js:36 js/apps.js:76
 msgid "Disable"
@@ -105,15 +112,15 @@ msgstr "Включить"
 
 #: js/apps.js:55
 msgid "Please wait...."
-msgstr ""
+msgstr "Повремени..."
 
 #: js/apps.js:84
 msgid "Updating...."
-msgstr ""
+msgstr "Обновление..."
 
 #: js/apps.js:87
 msgid "Error while updating app"
-msgstr ""
+msgstr "Ошибка в процессе обновления приложения"
 
 #: js/apps.js:87
 msgid "Error"
@@ -121,9 +128,9 @@ msgstr "Ошибка"
 
 #: js/apps.js:90
 msgid "Updated"
-msgstr ""
+msgstr "Обновлено"
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Сохранение..."
 
@@ -200,67 +207,83 @@ msgstr "Загрузка Android-приложения"
 msgid "Download iOS Client"
 msgstr "Загрузка iOS-приложения"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Ваш пароль изменён"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Невозможно сменить пароль"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Текущий пароль"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Новый пароль"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "показать"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Сменить пароль"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Отображаемое имя"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr "Ваше отображаемое имя было изменено"
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr "Невозможно изменить Ваше отображаемое имя"
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr "Изменить отображаемое имя"
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "e-mail"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Ваш адрес электронной почты"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Введите адрес электронной почты, чтобы появилась возможность восстановления пароля"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Язык"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Помочь с переводом"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Используйте этот URL для подключения файлового менеджера к Вашему хранилищу"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Версия"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -272,7 +295,7 @@ msgstr "Разрабатывается <a href=\"http://ownCloud.org/contact\" t
 
 #: templates/users.php:21 templates/users.php:79
 msgid "Login Name"
-msgstr ""
+msgstr "Имя пользователя"
 
 #: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
@@ -294,10 +317,6 @@ msgstr "Неограниченно"
 msgid "Other"
 msgstr "Другое"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Группа Администраторы"
@@ -308,11 +327,11 @@ msgstr "Хранилище"
 
 #: templates/users.php:97
 msgid "change display name"
-msgstr ""
+msgstr "изменить отображаемое имя"
 
 #: templates/users.php:101
 msgid "set new password"
-msgstr ""
+msgstr "установить новый пароль"
 
 #: templates/users.php:137
 msgid "Default"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index 0d01260dd95..d9c19d16f88 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -6,12 +6,13 @@
 #   <4671992@gmail.com>, 2012.
 # Denis  <reg.transifex.net@demitel.ru>, 2012.
 #   <semen@sam002.net>, 2012.
+# Дмитрий <langaru@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -22,11 +23,11 @@ msgstr ""
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Не удалось удалить конфигурацию сервера"
 
 #: ajax/testConfiguration.php:35
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "Конфигурация правильная и подключение может быть установлено!"
 
 #: ajax/testConfiguration.php:37
 msgid ""
@@ -38,7 +39,7 @@ msgstr ""
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr ""
+msgstr "Конфигурация не верна. Пожалуйста, посмотрите в журнале ownCloud детали."
 
 #: js/settings.js:66
 msgid "Deletion failed"
@@ -46,31 +47,31 @@ msgstr "Удаление не удалось"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "Принять настройки из последней конфигурации сервера?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr ""
+msgstr "Сохранить настройки?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
-msgstr ""
+msgstr "Не получилось добавить конфигурацию сервера"
 
 #: js/settings.js:121
 msgid "Connection test succeeded"
-msgstr ""
+msgstr "Проверка соединения удалась"
 
 #: js/settings.js:126
 msgid "Connection test failed"
-msgstr ""
+msgstr "Проверка соединения не удалась"
 
 #: js/settings.js:136
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "Вы действительно хотите удалить существующую конфигурацию сервера?"
 
 #: js/settings.js:137
 msgid "Confirm Deletion"
-msgstr ""
+msgstr "Подтверждение удаления"
 
 #: templates/settings.php:8
 msgid ""
@@ -87,11 +88,11 @@ msgstr ""
 
 #: templates/settings.php:15
 msgid "Server configuration"
-msgstr ""
+msgstr "Конфигурация сервера"
 
 #: templates/settings.php:17
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "Добавить конфигурацию сервера"
 
 #: templates/settings.php:21
 msgid "Host"
@@ -175,11 +176,11 @@ msgstr "без заполнения, например \"objectClass=posixGroup\"
 
 #: templates/settings.php:31
 msgid "Connection Settings"
-msgstr ""
+msgstr "Настройки подключения"
 
 #: templates/settings.php:33
 msgid "Configuration Active"
-msgstr ""
+msgstr "Конфигурация активна"
 
 #: templates/settings.php:33
 msgid "When unchecked, this configuration will be skipped."
@@ -205,7 +206,7 @@ msgstr ""
 
 #: templates/settings.php:37
 msgid "Disable Main Server"
-msgstr ""
+msgstr "Отключение главного сервера"
 
 #: templates/settings.php:37
 msgid "When switched on, ownCloud will only connect to the replica server."
@@ -216,8 +217,8 @@ msgid "Use TLS"
 msgstr "Использовать TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Не используйте для соединений SSL"
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
@@ -243,7 +244,7 @@ msgstr "в секундах. Изменение очистит кэш."
 
 #: templates/settings.php:43
 msgid "Directory Settings"
-msgstr ""
+msgstr "Настройки каталога"
 
 #: templates/settings.php:45
 msgid "User Display Name Field"
@@ -263,11 +264,11 @@ msgstr ""
 
 #: templates/settings.php:47
 msgid "User Search Attributes"
-msgstr ""
+msgstr "Поисковые атрибуты пользователя"
 
 #: templates/settings.php:47 templates/settings.php:50
 msgid "Optional; one attribute per line"
-msgstr ""
+msgstr "Опционально; один атрибут на линию"
 
 #: templates/settings.php:48
 msgid "Group Display Name Field"
@@ -295,7 +296,7 @@ msgstr "Ассоциация Группа-Участник"
 
 #: templates/settings.php:53
 msgid "Special Attributes"
-msgstr ""
+msgstr "Специальные атрибуты"
 
 #: templates/settings.php:56
 msgid "in bytes"
diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po
index 465c3cb0a8b..a32af7892a2 100644
--- a/l10n/ru_RU/core.po
+++ b/l10n/ru_RU/core.po
@@ -5,12 +5,13 @@
 # Translators:
 #  <cdewqazxsqwe@gmail.com>, 2013.
 #   <cdewqazxsqwe@gmail.com>, 2012.
+# Дмитрий <langaru@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "MIME-Version: 1.0\n"
@@ -52,8 +53,9 @@ msgid "No category to add?"
 msgstr "Нет категории для добавления?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Эта категория уже существует:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr "Эта категория уже существует: %s"
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -157,59 +159,59 @@ msgstr "Ноябрь"
 msgid "December"
 msgstr "Декабрь"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "секунд назад"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr " 1 минуту назад"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{минуты} минут назад"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "1 час назад"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{часы} часов назад"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "сегодня"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{дни} дней назад"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "в прошлом месяце"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{месяцы} месяцев назад"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "месяц назад"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "в прошлом году"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "лет назад"
 
@@ -468,7 +470,7 @@ msgstr "Редактирование категорий"
 msgid "Add"
 msgstr "Добавить"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Предупреждение системы безопасности"
 
@@ -478,71 +480,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Нет доступного защищенного генератора случайных чисел, пожалуйста, включите расширение PHP OpenSSL."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Без защищенного генератора случайных чисел злоумышленник может спрогнозировать пароль, сбросить учетные данные и завладеть Вашим аккаунтом."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Ваши каталоги данных и файлы, вероятно, доступны из Интернета. Файл .htaccess, предоставляемый ownCloud, не работает. Мы настоятельно рекомендуем Вам настроить вебсервер таким образом, чтобы каталоги данных больше не были доступны, или переместить их за пределы корневого каталога документов веб-сервера."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Создать <strong>admin account</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Расширенный"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Папка данных"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Настроить базу данных"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "будет использоваться"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Пользователь базы данных"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Пароль базы данных"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Имя базы данных"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Табличная область базы данных"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Сервер базы данных"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Завершение настройки"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "веб-сервисы под Вашим контролем"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Выйти"
 
@@ -564,14 +570,18 @@ msgstr "Пожалуйста, измените пароль, чтобы защи
 msgid "Lost your password?"
 msgstr "Забыли пароль?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "запомнить"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Войти"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr "Альтернативные Имена"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "предыдущий"
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
index d0beae0d809..574b383f37a 100644
--- a/l10n/ru_RU/files.po
+++ b/l10n/ru_RU/files.po
@@ -6,12 +6,13 @@
 #  <cdewqazxsqwe@gmail.com>, 2013.
 #   <cdewqazxsqwe@gmail.com>, 2012.
 #   <skoptev@ukr.net>, 2012.
+# Дмитрий <langaru@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "MIME-Version: 1.0\n"
@@ -20,46 +21,60 @@ msgstr ""
 "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/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Файл не был загружен. Неизвестная ошибка"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Ошибка отсутствует, файл загружен успешно."
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Размер загружаемого файла превышает upload_max_filesize директиву в php.ini:"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Размер загруженного"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Загружаемый файл был загружен частично"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Файл не был загружен"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Отсутствует временная папка"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Не удалось записать на диск"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Не достаточно свободного места"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Неверный каталог."
 
@@ -71,11 +86,15 @@ msgstr "Файлы"
 msgid "Unshare"
 msgstr "Скрыть"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr "Удалить навсегда"
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Удалить"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Переименовать"
 
@@ -109,7 +128,7 @@ msgstr "заменено {новое_имя} с {старое_имя}"
 
 #: js/filelist.js:280
 msgid "perform delete operation"
-msgstr ""
+msgstr "выполняется процесс удаления"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -127,17 +146,17 @@ 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 ""
+msgstr "Ваше хранилище почти полно ({usedSpacePercent}%)"
 
 #: js/files.js:224
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr ""
+msgstr "Идёт подготовка к скачке Вашего файла. Это может занять некоторое время, если фалы большие."
 
 #: js/files.js:261
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
@@ -180,31 +199,31 @@ msgstr "URL не должен быть пустым."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Неверное имя папки. Использование наименования 'Опубликовано' зарезервировано Owncloud"
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Имя"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Изменен"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{количество} папок"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{количество} файлов"
 
@@ -262,7 +281,7 @@ msgstr "По ссылке"
 
 #: templates/index.php:40
 msgid "Trash"
-msgstr ""
+msgstr "Корзина"
 
 #: templates/index.php:46
 msgid "Cancel upload"
diff --git a/l10n/ru_RU/files_trashbin.po b/l10n/ru_RU/files_trashbin.po
index 71505abd669..d738f9f4215 100644
--- a/l10n/ru_RU/files_trashbin.po
+++ b/l10n/ru_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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 17:51+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"
 "MIME-Version: 1.0\n"
@@ -17,31 +17,45 @@ msgstr ""
 "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"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Имя"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{количество} папок"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{количество} файлов"
 
@@ -51,4 +65,4 @@ msgstr ""
 
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
-msgstr ""
+msgstr "Восстановить"
diff --git a/l10n/ru_RU/files_versions.po b/l10n/ru_RU/files_versions.po
index 440d5bbecb0..1cb13519bbb 100644
--- a/l10n/ru_RU/files_versions.po
+++ b/l10n/ru_RU/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,45 @@ msgstr ""
 "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/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "История"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Файлы управления версиями"
diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po
index b7258db60ab..184b4e73c63 100644
--- a/l10n/ru_RU/settings.po
+++ b/l10n/ru_RU/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
 "MIME-Version: 1.0\n"
@@ -23,6 +23,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Невозможно загрузить список из App Store"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Ошибка авторизации"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Группа уже существует"
@@ -47,10 +56,6 @@ msgstr "Неверный email"
 msgid "Unable to delete group"
 msgstr "Невозможно удалить группу"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Ошибка авторизации"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Невозможно удалить пользователя"
@@ -113,7 +118,7 @@ msgstr "Ошибка"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Сохранение"
 
@@ -190,67 +195,83 @@ msgstr "Загрузить клиент под Android "
 msgid "Download iOS Client"
 msgstr "Загрузить клиент под iOS "
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Ваш пароль был изменен"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Невозможно изменить Ваш пароль"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Текущий пароль"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Новый пароль"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "показать"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Изменить пароль"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Электронная почта"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Адрес Вашей электронной почты"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Введите адрес электронной почты для возможности восстановления пароля"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Язык"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Помогите перевести"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Используйте этот адрес для подключения к ownCloud в Вашем файловом менеджере"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Версия"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -284,10 +305,6 @@ msgstr "Неограниченный"
 msgid "Other"
 msgstr "Другой"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Группа Admin"
diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po
index 848fc9df8d7..0b6b9ebf1a5 100644
--- a/l10n/ru_RU/user_ldap.po
+++ b/l10n/ru_RU/user_ldap.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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
 "MIME-Version: 1.0\n"
@@ -215,8 +215,8 @@ msgid "Use TLS"
 msgstr "Использовать TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Не используйте это SSL-соединений, это не будет выполнено."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index 1d65d6ef591..d628f447037 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -53,7 +53,8 @@ msgid "No category to add?"
 msgstr ""
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
+#, php-format
+msgid "This category already exists: %s"
 msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
@@ -158,59 +159,59 @@ msgstr "නොවැම්බර්"
 msgid "December"
 msgstr "දෙසැම්බර්"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "සැකසුම්"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "තත්පරයන්ට පෙර"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 මිනිත්තුවකට පෙර"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "අද"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "ඊයේ"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "පෙර මාසයේ"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "මාස කීපයකට පෙර"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "පෙර අවුරුද්දේ"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "අවුරුදු කීපයකට පෙර"
 
@@ -469,7 +470,7 @@ msgstr "ප්‍රභේදයන් සංස්කරණය"
 msgid "Add"
 msgstr "එක් කරන්න"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "ආරක්ෂක නිවේදනයක්"
 
@@ -479,71 +480,75 @@ msgid ""
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "ආරක්ෂිත අහඹු සංඛ්‍යා උත්පාදකයක් නොමැති නම් ඔබගේ ගිණුමට පහරදෙන අයකුට එහි මුරපද යළි පිහිටුවීමට අවශ්‍ය ටෝකන පහසුවෙන් සොයාගෙන ඔබගේ ගිණුම පැහැරගත හැක."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "ඔබගේ දත්ත ඩිරෙක්ටරිය හා ගොනුවලට අන්තර්ජාලයෙන් පිවිසිය හැක. ownCloud සපයා ඇති .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>."
+msgstr ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "දියුණු/උසස්"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "දත්ත ෆෝල්ඩරය"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "දත්ත සමුදාය හැඩගැසීම"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "භාවිතා වනු ඇත"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "දත්තගබඩා භාවිතාකරු"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "දත්තගබඩාවේ මුරපදය"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "දත්තගබඩාවේ නම"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "දත්තගබඩා සේවාදායකයා"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "ස්ථාපනය කිරීම අවසන් කරන්න"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "නික්මීම"
 
@@ -565,14 +570,18 @@ msgstr ""
 msgid "Lost your password?"
 msgstr "මුරපදය අමතකද?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "මතක තබාගන්න"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "ප්‍රවේශවන්න"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "පෙර"
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index b61cf98e2dd..e3e769381eb 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.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-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -19,46 +19,60 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "ගොනුවක් උඩුගත නොවුනි. නොහැඳිනු දෝෂයක්"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "නිවැරදි ව ගොනුව උඩුගත කෙරිනි"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "උඩුගත කළ ගොනුවේ විශාලත්වය HTML පෝරමයේ නියම කළ ඇති MAX_FILE_SIZE විශාලත්වයට වඩා වැඩිය"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "උඩුගත කළ ගොනුවේ කොටසක් පමණක් උඩුගත විය"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "කිසිදු ගොනවක් උඩුගත නොවිනි"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "තාවකාලික ෆොල්ඩරයක් සොයාගත නොහැක"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "තැටිගත කිරීම අසාර්ථකයි"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -70,11 +84,15 @@ msgstr "ගොනු"
 msgid "Unshare"
 msgstr "නොබෙදු"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "මකන්න"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "නැවත නම් කරන්න"
 
@@ -179,31 +197,31 @@ msgstr "යොමුව හිස් විය නොහැක"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "නම"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "ප්‍රමාණය"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "වෙනස් කළ"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 ෆොල්ඩරයක්"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 ගොනුවක්"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/si_LK/files_trashbin.po b/l10n/si_LK/files_trashbin.po
index c5abfae0b81..a1174c1e82c 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "නම"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 ෆොල්ඩරයක්"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 ගොනුවක්"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/si_LK/files_versions.po b/l10n/si_LK/files_versions.po
index 65443ed184b..a7a9fdc4990 100644
--- a/l10n/si_LK/files_versions.po
+++ b/l10n/si_LK/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "ඉතිහාසය"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "ගොනු අනුවාදයන්"
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index 76d2386842e..223283dfa92 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -24,6 +24,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "සත්‍යාපන දෝෂයක්"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "කණ්ඩායම දැනටමත් තිබේ"
@@ -48,10 +57,6 @@ msgstr "අවලංගු වි-තැපෑල"
 msgid "Unable to delete group"
 msgstr "කණ්ඩායම මැකීමට නොහැක"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "සත්‍යාපන දෝෂයක්"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "පරිශීලකයා මැකීමට නොහැක"
@@ -114,7 +119,7 @@ msgstr "දෝෂයක්"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "සුරැකෙමින් පවතී..."
 
@@ -191,67 +196,83 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "මුරපදය"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "ඔබගේ මුර පදය වෙනස් කෙරුණි"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "මුර පදය වෙනස් කළ නොහැකි විය"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "වත්මන් මුරපදය"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "නව මුරපදය"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "ප්‍රදර්ශනය කිරීම"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "මුරපදය වෙනස් කිරීම"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "විද්‍යුත් තැපෑල"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "ඔබගේ විද්‍යුත් තැපෑල"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "මුරපද ප්‍රතිස්ථාපනය සඳහා විද්‍යුත් තැපැල් විස්තර ලබා දෙන්න"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "භාෂාව"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "පරිවර්ථන සහය"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -285,10 +306,6 @@ msgstr ""
 msgid "Other"
 msgstr "වෙනත්"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "කාණ්ඩ පරිපාලක"
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index cb5a0b25f19..992b171e909 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -214,7 +214,7 @@ msgid "Use TLS"
 msgstr "TLS භාවිතා කරන්න"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
 #: templates/settings.php:39
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
new file mode 100644
index 00000000000..5986e77ed44
--- /dev/null
+++ b/l10n/sk/core.po
@@ -0,0 +1,593 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: ajax/share.php:85
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:87
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:89
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:91
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
+#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
+msgid "Category type not provided."
+msgstr ""
+
+#: ajax/vcategories/add.php:30
+msgid "No category to add?"
+msgstr ""
+
+#: ajax/vcategories/add.php:37
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
+
+#: 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 ""
+
+#: ajax/vcategories/addToFavorites.php:30
+#: ajax/vcategories/removeFromFavorites.php:30
+#, php-format
+msgid "%s ID not provided."
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:35
+#, php-format
+msgid "Error adding %s to favorites."
+msgstr ""
+
+#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: ajax/vcategories/removeFromFavorites.php:35
+#, php-format
+msgid "Error removing %s from favorites."
+msgstr ""
+
+#: js/config.php:32
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:33
+msgid "January"
+msgstr ""
+
+#: js/config.php:33
+msgid "February"
+msgstr ""
+
+#: js/config.php:33
+msgid "March"
+msgstr ""
+
+#: js/config.php:33
+msgid "April"
+msgstr ""
+
+#: js/config.php:33
+msgid "May"
+msgstr ""
+
+#: js/config.php:33
+msgid "June"
+msgstr ""
+
+#: js/config.php:33
+msgid "July"
+msgstr ""
+
+#: js/config.php:33
+msgid "August"
+msgstr ""
+
+#: js/config.php:33
+msgid "September"
+msgstr ""
+
+#: js/config.php:33
+msgid "October"
+msgstr ""
+
+#: js/config.php:33
+msgid "November"
+msgstr ""
+
+#: js/config.php:33
+msgid "December"
+msgstr ""
+
+#: js/js.js:284
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:764
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:765
+msgid "1 minute ago"
+msgstr ""
+
+#: js/js.js:766
+msgid "{minutes} minutes ago"
+msgstr ""
+
+#: js/js.js:767
+msgid "1 hour ago"
+msgstr ""
+
+#: js/js.js:768
+msgid "{hours} hours ago"
+msgstr ""
+
+#: js/js.js:769
+msgid "today"
+msgstr ""
+
+#: js/js.js:770
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:771
+msgid "{days} days ago"
+msgstr ""
+
+#: js/js.js:772
+msgid "last month"
+msgstr ""
+
+#: js/js.js:773
+msgid "{months} months ago"
+msgstr ""
+
+#: js/js.js:774
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:775
+msgid "last year"
+msgstr ""
+
+#: js/js.js:776
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:126
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:162
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:163
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:180
+msgid "Ok"
+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
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
+msgid "Error"
+msgstr ""
+
+#: js/oc-vcategories.js:179
+msgid "The app name is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js:194
+msgid "The required file {file} is not installed!"
+msgstr ""
+
+#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
+msgid "Share"
+msgstr ""
+
+#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:152
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:159
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:168
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:170
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:175
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:180
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:183
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+msgid "Password"
+msgstr ""
+
+#: js/share.js:189
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:190
+msgid "Send"
+msgstr ""
+
+#: js/share.js:194
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:195
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:227
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:229
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:256
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:292
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:313
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:325
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:327
+msgid "access control"
+msgstr ""
+
+#: js/share.js:330
+msgid "create"
+msgstr ""
+
+#: js/share.js:333
+msgid "update"
+msgstr ""
+
+#: js/share.js:336
+msgid "delete"
+msgstr ""
+
+#: js/share.js:339
+msgid "share"
+msgstr ""
+
+#: js/share.js:373 js/share.js:558
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:571
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:583
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:598
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:609
+msgid "Email sent"
+msgstr ""
+
+#: js/update.js:14
+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 ""
+
+#: js/update.js:18
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:47
+msgid "ownCloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:28
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:16
+msgid "Add"
+msgstr ""
+
+#: templates/installation.php:23 templates/installation.php:30
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:24
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:25
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr ""
+
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:32
+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 ""
+
+#: templates/installation.php:36
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:52
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:54
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:61
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:113
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:117
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:125
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:131
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:136
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.guest.php:33
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:48
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:11
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:13
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:19
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:41
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:43
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr ""
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr ""
+
+#: templates/update.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
+msgstr ""
diff --git a/l10n/sk/files.po b/l10n/sk/files.po
new file mode 100644
index 00000000000..e1beb2b3ae5
--- /dev/null
+++ b/l10n/sk/files.po
@@ -0,0 +1,314 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:26
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:27
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in 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 ""
+
+#: ajax/upload.php:31
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:32
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:33
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:34
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:83
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:10
+msgid "Files"
+msgstr ""
+
+#: js/fileactions.js:117 templates/index.php:85 templates/index.php:86
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr ""
+
+#: js/fileactions.js:187
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:208 js/filelist.js:210
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/filelist.js:208 js/filelist.js:210
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:208
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:208 js/filelist.js:210
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:253
+msgid "replaced {new_name}"
+msgstr ""
+
+#: js/filelist.js:253 js/filelist.js:255
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:255
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
+
+#: js/filelist.js:280
+msgid "perform delete operation"
+msgstr ""
+
+#: js/files.js:52
+msgid "'.' is an invalid file name."
+msgstr ""
+
+#: js/files.js:56
+msgid "File name cannot be empty."
+msgstr ""
+
+#: js/files.js:64
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:224
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:261
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:261
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:278
+msgid "Close"
+msgstr ""
+
+#: js/files.js:297 js/files.js:413 js/files.js:444
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:317
+msgid "1 file uploading"
+msgstr ""
+
+#: js/files.js:320 js/files.js:375 js/files.js:390
+msgid "{count} files uploading"
+msgstr ""
+
+#: js/files.js:393 js/files.js:428
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:502
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:575
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/files.js:580
+msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
+msgstr ""
+
+#: js/files.js:953 templates/index.php:67
+msgid "Name"
+msgstr ""
+
+#: js/files.js:954 templates/index.php:78
+msgid "Size"
+msgstr ""
+
+#: js/files.js:955 templates/index.php:80
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:974
+msgid "1 folder"
+msgstr ""
+
+#: js/files.js:976
+msgid "{count} folders"
+msgstr ""
+
+#: js/files.js:984
+msgid "1 file"
+msgstr ""
+
+#: js/files.js:986
+msgid "{count} files"
+msgstr ""
+
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:20
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:22
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:26
+msgid "Save"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:12
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:14
+msgid "From link"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Trash"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:59
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:73
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:105
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:107
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:112
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:115
+msgid "Current scanning"
+msgstr ""
+
+#: templates/upgrade.php:2
+msgid "Upgrading filesystem cache..."
+msgstr ""
diff --git a/l10n/sk/files_encryption.po b/l10n/sk/files_encryption.po
new file mode 100644
index 00000000000..1873413f16c
--- /dev/null
+++ b/l10n/sk/files_encryption.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "None"
+msgstr ""
diff --git a/l10n/sk/files_external.po b/l10n/sk/files_external.po
new file mode 100644
index 00000000000..3c72b5b4714
--- /dev/null
+++ b/l10n/sk/files_external.po
@@ -0,0 +1,120 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:73 js/google.js:72
+msgid "Fill out all required fields"
+msgstr ""
+
+#: js/dropbox.js:85
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:26 js/google.js:73 js/google.js:78
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: lib/config.php:405
+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 ""
+
+#: lib/config.php:406
+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 ""
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:8 templates/settings.php:22
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:144 templates/settings.php:145
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:124
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:125
+msgid "Allow users to mount their own external storage"
+msgstr ""
+
+#: templates/settings.php:136
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:153
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/sk/files_sharing.po b/l10n/sk/files_sharing.po
new file mode 100644
index 00000000000..942e60b0498
--- /dev/null
+++ b/l10n/sk/files_sharing.po
@@ -0,0 +1,48 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
+
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
+
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:29
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:35
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/sk/files_trashbin.po b/l10n/sk/files_trashbin.po
new file mode 100644
index 00000000000..86550447566
--- /dev/null
+++ b/l10n/sk/files_trashbin.po
@@ -0,0 +1,68 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-01-31 16:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
+msgid "perform restore operation"
+msgstr ""
+
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
+msgid "Name"
+msgstr ""
+
+#: js/trash.js:126 templates/index.php:27
+msgid "Deleted"
+msgstr ""
+
+#: js/trash.js:135
+msgid "1 folder"
+msgstr ""
+
+#: js/trash.js:137
+msgid "{count} folders"
+msgstr ""
+
+#: js/trash.js:145
+msgid "1 file"
+msgstr ""
+
+#: js/trash.js:147
+msgid "{count} files"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:20 templates/index.php:22
+msgid "Restore"
+msgstr ""
diff --git a/l10n/sk/files_versions.po b/l10n/sk/files_versions.po
new file mode 100644
index 00000000000..dd26d70a1cc
--- /dev/null
+++ b/l10n/sk/files_versions.po
@@ -0,0 +1,65 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr ""
diff --git a/l10n/sk/lib.po b/l10n/sk/lib.po
new file mode 100644
index 00000000000..0d0976b9704
--- /dev/null
+++ b/l10n/sk/lib.po
@@ -0,0 +1,156 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: app.php:313
+msgid "Help"
+msgstr ""
+
+#: app.php:320
+msgid "Personal"
+msgstr ""
+
+#: app.php:325
+msgid "Settings"
+msgstr ""
+
+#: app.php:330
+msgid "Users"
+msgstr ""
+
+#: app.php:337
+msgid "Apps"
+msgstr ""
+
+#: app.php:339
+msgid "Admin"
+msgstr ""
+
+#: files.php:202
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:203
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:203 files.php:228
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:227
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: helper.php:226
+msgid "couldn't be determined"
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:62 json.php:73
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: search/provider/file.php:17 search/provider/file.php:35
+msgid "Files"
+msgstr ""
+
+#: search/provider/file.php:26 search/provider/file.php:33
+msgid "Text"
+msgstr ""
+
+#: search/provider/file.php:29
+msgid "Images"
+msgstr ""
+
+#: template.php:113
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:114
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:115
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:116
+msgid "1 hour ago"
+msgstr ""
+
+#: template.php:117
+#, php-format
+msgid "%d hours ago"
+msgstr ""
+
+#: template.php:118
+msgid "today"
+msgstr ""
+
+#: template.php:119
+msgid "yesterday"
+msgstr ""
+
+#: template.php:120
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:121
+msgid "last month"
+msgstr ""
+
+#: template.php:122
+#, php-format
+msgid "%d months ago"
+msgstr ""
+
+#: template.php:123
+msgid "last year"
+msgstr ""
+
+#: template.php:124
+msgid "years ago"
+msgstr ""
+
+#: updater.php:75
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:77
+msgid "up to date"
+msgstr ""
+
+#: updater.php:80
+msgid "updates check is disabled"
+msgstr ""
+
+#: vcategories.php:188 vcategories.php:249
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po
new file mode 100644
index 00000000000..8ae555c067a
--- /dev/null
+++ b/l10n/sk/settings.po
@@ -0,0 +1,328 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2011-07-25 16:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: ajax/apps/ocs.php:20
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/enableapp.php:11
+msgid "Could not enable app. "
+msgstr ""
+
+#: ajax/lostpassword.php:12
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:24
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/setlanguage.php:15
+msgid "Language changed"
+msgstr ""
+
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr ""
+
+#: ajax/togglegroups.php:28
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:34
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: ajax/updateapp.php:13
+msgid "Couldn't update app."
+msgstr ""
+
+#: js/apps.js:30
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:36 js/apps.js:76
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:36 js/apps.js:64
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:55
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:84
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:87
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:87
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:90
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:96
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:34 personal.php:35
+msgid "__language_name__"
+msgstr ""
+
+#: templates/apps.php:10
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:11
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:24
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:29
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/apps.php:31
+msgid "Update"
+msgstr ""
+
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
+
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
+
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
+
+#: templates/personal.php:8
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:12
+msgid "Clients"
+msgstr ""
+
+#: templates/personal.php:13
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:24
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:27
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:28
+msgid "show"
+msgstr ""
+
+#: templates/personal.php:29
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:56
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:57
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:63 templates/personal.php:64
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:69
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:74
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:85
+msgid "Version"
+msgstr ""
+
+#: templates/personal.php:87
+msgid ""
+"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>."
+msgstr ""
+
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
+msgid "Groups"
+msgstr ""
+
+#: templates/users.php:32
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:35
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:42 templates/users.php:142
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:60 templates/users.php:157
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
+msgid "Group Admin"
+msgstr ""
+
+#: templates/users.php:86
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:97
+msgid "change display name"
+msgstr ""
+
+#: templates/users.php:101
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:137
+msgid "Default"
+msgstr ""
+
+#: templates/users.php:165
+msgid "Delete"
+msgstr ""
diff --git a/l10n/sk/user_ldap.po b/l10n/sk/user_ldap.po
new file mode 100644
index 00000000000..3148a062161
--- /dev/null
+++ b/l10n/sk/user_ldap.po
@@ -0,0 +1,309 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:35
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:37
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:40
+msgid ""
+"The configuration is invalid. Please look in the ownCloud log for further "
+"details."
+msgstr ""
+
+#: js/settings.js:66
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:82
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:97
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:121
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:126
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:136
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:137
+msgid "Confirm Deletion"
+msgstr ""
+
+#: templates/settings.php:8
+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
+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
+msgid "Server configuration"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:21
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:23
+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:24
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:25
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:25
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:26
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:26
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:34
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:35
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:36
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "When switched on, ownCloud will only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:38
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:38
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:39
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:41
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:47 templates/settings.php:50
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:49
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:49
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:50
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:56
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:58
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Help"
+msgstr ""
diff --git a/l10n/sk/user_webdavauth.po b/l10n/sk/user_webdavauth.po
new file mode 100644
index 00000000000..eb6e13c58c0
--- /dev/null
+++ b/l10n/sk/user_webdavauth.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:7
+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 ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 573c3348cb4..fa46fb2750a 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# georg <georg007@gmail.com>, 2013.
 #   <intense.feel@gmail.com>, 2011, 2012.
 # Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
 #   <martin.babik@gmail.com>, 2012.
@@ -13,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -56,8 +57,9 @@ msgid "No category to add?"
 msgstr "Žiadna kategória pre pridanie?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Táto kategória už existuje:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr "Kategéria: %s už existuje."
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -161,59 +163,59 @@ msgstr "November"
 msgid "December"
 msgstr "December"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "pred sekundami"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "pred minútou"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "pred {minutes} minútami"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "Pred 1 hodinou."
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "Pred {hours} hodinami."
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "včera"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "pred {days} dňami"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "minulý mesiac"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "Pred {months} mesiacmi."
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "pred mesiacmi"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "minulý rok"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "pred rokmi"
 
@@ -472,7 +474,7 @@ msgstr "Úprava kategórií"
 msgid "Add"
 msgstr "Pridať"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Bezpečnostné varovanie"
 
@@ -482,71 +484,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Nie je dostupný žiadny bezpečný generátor náhodných čísel, prosím, povoľte rozšírenie OpenSSL v PHP."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Bez bezpečného generátora náhodných čísel môže útočník predpovedať token pre obnovu hesla a prevziať kontrolu nad vaším kontom."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Váš priečinok s dátami a Vaše súbory sú pravdepodobne dostupné z internetu. .htaccess súbor dodávaný s inštaláciou ownCloud nespĺňa úlohu. Dôrazne Vám doporučujeme nakonfigurovať webserver takým spôsobom, aby dáta v priečinku neboli verejné, alebo presuňte dáta mimo štruktúry priečinkov webservera."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Vytvoriť <strong>administrátorský účet</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Priečinok dát"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Nastaviť databázu"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "bude použité"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Hostiteľ databázy"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Heslo databázy"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Meno databázy"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Tabuľkový priestor databázy"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Server databázy"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Dokončiť inštaláciu"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "webové služby pod vašou kontrolou"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Odhlásiť"
 
@@ -568,14 +574,18 @@ msgstr "Prosím, zmeňte svoje heslo pre opätovné zabezpečenie Vášho účtu
 msgid "Lost your password?"
 msgstr "Zabudli ste heslo?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "zapamätať"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Prihlásiť sa"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr "Altrnatívne loginy"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "späť"
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index cd6c5db9e95..618ce24cad4 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# georg <georg007@gmail.com>, 2013.
 #   <intense.feel@gmail.com>, 2012.
 # Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
 #   <martin.babik@gmail.com>, 2012.
@@ -12,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 20:00+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,6 +23,20 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Žiaden súbor nebol odoslaný. Neznáma chyba"
@@ -58,8 +73,8 @@ msgid "Failed to write to disk"
 msgstr "Zápis na disk sa nepodaril"
 
 #: ajax/upload.php:52
-msgid "Not enough space available"
-msgstr "Nie je k dispozícii dostatok miesta"
+msgid "Not enough storage available"
+msgstr ""
 
 #: ajax/upload.php:83
 msgid "Invalid directory."
@@ -73,11 +88,15 @@ msgstr "Súbory"
 msgid "Unshare"
 msgstr "Nezdielať"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr "Zmazať  trvalo"
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Premenovať"
 
diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po
index 7977f0fe3e1..1e9b778f267 100644
--- a/l10n/sk_SK/files_encryption.po
+++ b/l10n/sk_SK/files_encryption.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# georg <georg007@gmail.com>, 2013.
 #   <intense.feel@gmail.com>, 2012.
 # Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 22:50+0000\n"
+"Last-Translator: georg007 <georg007@gmail.com>\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"
@@ -47,15 +48,15 @@ msgstr "Šifrovanie"
 
 #: templates/settings-personal.php:7
 msgid "File encryption is enabled."
-msgstr ""
+msgstr "Kryptovanie súborov nastavené."
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "Uvedené typy súborov nebudú kryptované:"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "Nekryptovať uvedené typy súborov"
 
 #: templates/settings.php:12
 msgid "None"
diff --git a/l10n/sk_SK/files_trashbin.po b/l10n/sk_SK/files_trashbin.po
index e11f6529c52..93a413261a4 100644
--- a/l10n/sk_SK/files_trashbin.po
+++ b/l10n/sk_SK/files_trashbin.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# georg <georg007@gmail.com>, 2013.
 # Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 20:00+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 22:50+0000\n"
+"Last-Translator: georg007 <georg007@gmail.com>\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"
@@ -18,31 +19,45 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr "Nemožno obnoviť %s"
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr "vykonať obnovu"
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr "trvalo zmazať súbor"
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Meno"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr "Zmazané"
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 priečinok"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} priečinkov"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 súbor"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} súborov"
 
diff --git a/l10n/sk_SK/files_versions.po b/l10n/sk_SK/files_versions.po
index 32d3549ff90..90a6c26e240 100644
--- a/l10n/sk_SK/files_versions.po
+++ b/l10n/sk_SK/files_versions.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# georg <georg007@gmail.com>, 2013.
 #   <martin.babik@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 22:40+0000\n"
+"Last-Translator: georg007 <georg007@gmail.com>\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"
@@ -18,10 +19,45 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr "uspech"
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr "Subror %s bol vrateny na verziu %s"
+
+#: history.php:49
+msgid "failure"
+msgstr "chyba"
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr "Nie sú dostupné žiadne staršie verzie"
+
+#: history.php:73
+msgid "No path specified"
+msgstr "Nevybrali ste cestu"
+
 #: js/versions.js:16
 msgid "History"
 msgstr "História"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Vytváranie verzií súborov"
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index cfaa9da6bc0..3ba63102905 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 20:00+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,6 +27,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Nie je možné nahrať zoznam z App Store"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Chyba pri autentifikácii"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Skupina už existuje"
@@ -51,10 +60,6 @@ msgstr "Neplatný email"
 msgid "Unable to delete group"
 msgstr "Nie je možné odstrániť skupinu"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Chyba pri autentifikácii"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Nie je možné odstrániť používateľa"
@@ -117,7 +122,7 @@ msgstr "Chyba"
 msgid "Updated"
 msgstr "Aktualizované"
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Ukladám..."
 
@@ -194,67 +199,83 @@ msgstr "Stiahnuť Android klienta"
 msgid "Download iOS Client"
 msgstr "Stiahnuť iOS klienta"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Heslo bolo zmenené"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Nie je možné zmeniť vaše heslo"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Aktuálne heslo"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Nové heslo"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "zobraziť"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Zmeniť heslo"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Zobrazované meno"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Vaša emailová adresa"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Vyplňte emailovú adresu pre aktivovanie obnovy hesla"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Jazyk"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Pomôcť s prekladom"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Použite túto adresu pre pripojenie vášho ownCloud k súborovému správcovi"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Verzia"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -288,10 +309,6 @@ msgstr "Nelimitované"
 msgid "Other"
 msgstr "Iné"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr "Zobrazované meno"
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Správca skupiny"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index ab48e3110ab..69f4aa7436b 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 20:00+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -215,8 +215,8 @@ msgid "Use TLS"
 msgstr "Použi TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Nepoužívajte pre pripojenie SSL, pripojenie zlyhá."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index d463f42279e..8f861f48a3a 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -54,8 +54,9 @@ msgid "No category to add?"
 msgstr "Ni kategorije za dodajanje?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Ta kategorija že obstaja:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -159,59 +160,59 @@ msgstr "november"
 msgid "December"
 msgstr "december"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "pred nekaj sekundami"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "pred minuto"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "pred {minutes} minutami"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "pred 1 uro"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "pred {hours} urami"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "danes"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "včeraj"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "pred {days} dnevi"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "zadnji mesec"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "pred {months} meseci"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "mesecev nazaj"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "lansko leto"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "let nazaj"
 
@@ -470,7 +471,7 @@ msgstr "Uredi kategorije"
 msgid "Add"
 msgstr "Dodaj"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Varnostno opozorilo"
 
@@ -480,71 +481,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Na voljo ni varnega generatorja naključnih števil. Prosimo, če omogočite PHP OpenSSL razširitev."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Brez varnega generatorja naključnih števil lahko napadalec napove žetone za ponastavitev gesla, kar mu omogoča, da prevzame vaš ​​račun."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Trenutno je dostop do podatkovne mape in datotek najverjetneje omogočen vsem uporabnikom na omrežju. Datoteka .htaccess, vključena v ownCloud namreč ni omogočena. Močno priporočamo nastavitev spletnega strežnika tako, da mapa podatkov ne bo javno dostopna ali pa, da jo prestavite ven iz korenske mape spletnega strežnika."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Ustvari <strong>skrbniški račun</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Napredne možnosti"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Mapa s podatki"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Nastavi podatkovno zbirko"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "bo uporabljen"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Uporabnik zbirke"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Geslo podatkovne zbirke"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Ime podatkovne zbirke"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Razpredelnica podatkovne zbirke"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Gostitelj podatkovne zbirke"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Dokončaj namestitev"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "spletne storitve pod vašim nadzorom"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Odjava"
 
@@ -566,14 +571,18 @@ msgstr "Spremenite geslo za izboljšanje zaščite računa."
 msgid "Lost your password?"
 msgstr "Ali ste pozabili geslo?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "Zapomni si me"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Prijava"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "nazaj"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 661f1ee1074..89ab93eb425 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -21,46 +21,60 @@ 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/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Nobena datoteka ni naložena. Neznana napaka."
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Datoteka je uspešno naložena brez napak."
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Naložena datoteka presega dovoljeno velikost. Le-ta je določena z vrstico upload_max_filesize v datoteki php.ini:"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Naložena datoteka presega velikost, ki jo določa parameter MAX_FILE_SIZE v HTML obrazcu"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Datoteka je le delno naložena"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Nobena datoteka ni bila naložena"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Manjka začasna mapa"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Pisanje na disk je spodletelo"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -72,11 +86,15 @@ msgstr "Datoteke"
 msgid "Unshare"
 msgstr "Odstrani iz souporabe"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Izbriši"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Preimenuj"
 
@@ -181,31 +199,31 @@ msgstr "Naslov URL ne sme biti prazen."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 mapa"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} map"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 datoteka"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} datotek"
 
diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po
index 835ba52d9ab..525f304069e 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ 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"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Ime"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 mapa"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} map"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 datoteka"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} datotek"
 
diff --git a/l10n/sl/files_versions.po b/l10n/sl/files_versions.po
index 1a4d2854d91..dad9f10280e 100644
--- a/l10n/sl/files_versions.po
+++ b/l10n/sl/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -19,10 +19,45 @@ 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/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Zgodovina"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Sledenje različicam"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 9ed9b294bdd..9046223ab32 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -25,6 +25,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Ni mogoče naložiti seznama iz App Store"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Napaka overitve"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Skupina že obstaja"
@@ -49,10 +58,6 @@ msgstr "Neveljaven elektronski naslov"
 msgid "Unable to delete group"
 msgstr "Ni mogoče izbrisati skupine"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Napaka overitve"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Ni mogoče izbrisati uporabnika"
@@ -115,7 +120,7 @@ msgstr "Napaka"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Poteka shranjevanje ..."
 
@@ -192,67 +197,83 @@ msgstr "Prenesi Android odjemalec"
 msgid "Download iOS Client"
 msgstr "Prenesi iOS odjemalec"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Geslo"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Vaše geslo je spremenjeno"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Gesla ni mogoče spremeniti."
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Trenutno geslo"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Novo geslo"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "pokaži"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Spremeni geslo"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Elektronska pošta"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Vaš elektronski poštni naslov"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Vpišite vaš elektronski naslov in s tem omogočite obnovitev gesla"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Pomagajte pri prevajanju"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Uporabite ta naslov za povezavo do ownCloud v vašem upravljalniku datotek."
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Različica"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -286,10 +307,6 @@ msgstr "Neomejeno"
 msgid "Other"
 msgstr "Drugo"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Skrbnik skupine"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index d644dac5e56..c3b92afff38 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -215,8 +215,8 @@ msgid "Use TLS"
 msgstr "Uporabi TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Uporaba SSL za povezave bo spodletela."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index a67b4bd93ab..c74ef339d87 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 19:00+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -53,8 +53,9 @@ msgid "No category to add?"
 msgstr "Додати још неку категорију?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Категорија већ постоји:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -158,59 +159,59 @@ msgstr "Новембар"
 msgid "December"
 msgstr "Децембар"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Подешавања"
 
-#: js/js.js:760
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "пре неколико секунди"
 
-#: js/js.js:761
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "пре 1 минут"
 
-#: js/js.js:762
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "пре {minutes} минута"
 
-#: js/js.js:763
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "Пре једног сата"
 
-#: js/js.js:764
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "Пре {hours} сата (сати)"
 
-#: js/js.js:765
+#: js/js.js:769
 msgid "today"
 msgstr "данас"
 
-#: js/js.js:766
+#: js/js.js:770
 msgid "yesterday"
 msgstr "јуче"
 
-#: js/js.js:767
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "пре {days} дана"
 
-#: js/js.js:768
+#: js/js.js:772
 msgid "last month"
 msgstr "прошлог месеца"
 
-#: js/js.js:769
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "Пре {months} месеца (месеци)"
 
-#: js/js.js:770
+#: js/js.js:774
 msgid "months ago"
 msgstr "месеци раније"
 
-#: js/js.js:771
+#: js/js.js:775
 msgid "last year"
 msgstr "прошле године"
 
-#: js/js.js:772
+#: js/js.js:776
 msgid "years ago"
 msgstr "година раније"
 
@@ -469,7 +470,7 @@ msgstr "Измени категорије"
 msgid "Add"
 msgstr "Додај"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Сигурносно упозорење"
 
@@ -479,71 +480,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Поуздан генератор случајних бројева није доступан, предлажемо да укључите PHP проширење OpenSSL."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Без поузданог генератора случајнох бројева нападач лако може предвидети лозинку за поништавање кључа шифровања и отети вам налог."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Тренутно су ваши подаци и датотеке доступне са интернета. Датотека .htaccess коју је обезбедио пакет ownCloud не функционише. Саветујемо вам да подесите веб сервер тако да директоријум са подацима не буде изложен или да га преместите изван коренског директоријума веб сервера."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Направи <strong>административни налог</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Напредно"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Фацикла података"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Подешавање базе"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "ће бити коришћен"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Корисник базе"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Лозинка базе"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Име базе"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Радни простор базе података"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Домаћин базе"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Заврши подешавање"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "веб сервиси под контролом"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Одјава"
 
@@ -573,6 +578,10 @@ msgstr "упамти"
 msgid "Log in"
 msgstr "Пријава"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "претходно"
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index a234e816481..e3ee1fecc94 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 15:00+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -20,46 +20,60 @@ 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/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Није дошло до грешке. Датотека је успешно отпремљена."
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Отпремљена датотека прелази смерницу upload_max_filesize у датотеци php.ini:"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Отпремљена датотека прелази смерницу MAX_FILE_SIZE која је наведена у HTML обрасцу"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Датотека је делимично отпремљена"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Датотека није отпремљена"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Недостаје привремена фасцикла"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Не могу да пишем на диск"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -71,11 +85,15 @@ msgstr "Датотеке"
 msgid "Unshare"
 msgstr "Укини дељење"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Обриши"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Преименуј"
 
@@ -180,31 +198,31 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Назив"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Величина"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Измењено"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 фасцикла"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} фасцикле/и"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 датотека"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} датотеке/а"
 
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index b7069b0278a..d2e787a42cd 100644
--- a/l10n/sr/files_sharing.po
+++ b/l10n/sr/files_sharing.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-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 19:00+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 17:30+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"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: templates/public.php:14 templates/public.php:30
 msgid "Download"
-msgstr ""
+msgstr "Преузми"
 
 #: templates/public.php:29
 msgid "No preview available for"
diff --git a/l10n/sr/files_trashbin.po b/l10n/sr/files_trashbin.po
index 5274cee524e..58c3430bb90 100644
--- a/l10n/sr/files_trashbin.po
+++ b/l10n/sr/files_trashbin.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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,31 +18,45 @@ 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"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr "врати у претходно стање"
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Име"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr "Обрисано"
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 фасцикла"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} фасцикле/и"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 датотека"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} датотеке/а"
 
diff --git a/l10n/sr/files_versions.po b/l10n/sr/files_versions.po
index 84371b65544..74719197c5f 100644
--- a/l10n/sr/files_versions.po
+++ b/l10n/sr/files_versions.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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 14:10+0000\n"
-"Last-Translator: Rancher <theranchcowboy@gmail.com>\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,10 +18,45 @@ 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/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Историја"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Прављење верзија датотека"
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index 58c80f3e1f1..5f6cad797ab 100644
--- a/l10n/sr/lib.po
+++ b/l10n/sr/lib.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 15:00+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 17:30+0000\n"
 "Last-Translator: Rancher <theranchcowboy@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -20,27 +20,27 @@ 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"
 
-#: app.php:312
+#: app.php:313
 msgid "Help"
 msgstr "Помоћ"
 
-#: app.php:319
+#: app.php:320
 msgid "Personal"
 msgstr "Лично"
 
-#: app.php:324
+#: app.php:325
 msgid "Settings"
 msgstr "Поставке"
 
-#: app.php:329
+#: app.php:330
 msgid "Users"
 msgstr "Корисници"
 
-#: app.php:336
+#: app.php:337
 msgid "Apps"
 msgstr "Апликације"
 
-#: app.php:338
+#: app.php:339
 msgid "Admin"
 msgstr "Администратор"
 
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 9bd0665d7c2..57f48decd57 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/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-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 19:00+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -23,6 +23,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Грешка приликом учитавања списка из Складишта Програма"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Грешка при аутентификацији"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Група већ постоји"
@@ -47,10 +56,6 @@ msgstr "Неисправна е-адреса"
 msgid "Unable to delete group"
 msgstr "Не могу да уклоним групу"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Грешка при аутентификацији"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Не могу да уклоним корисника"
@@ -113,7 +118,7 @@ msgstr "Грешка"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Чување у току..."
 
@@ -218,39 +223,55 @@ msgstr "прикажи"
 msgid "Change password"
 msgstr "Измени лозинку"
 
-#: templates/personal.php:38
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Е-пошта"
 
-#: templates/personal.php:39
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Ваша адреса е-поште"
 
-#: templates/personal.php:40
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ун"
 
-#: templates/personal.php:46 templates/personal.php:47
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Језик"
 
-#: templates/personal.php:52
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr " Помозите у превођењу"
 
-#: templates/personal.php:57
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -284,10 +305,6 @@ msgstr ""
 msgid "Other"
 msgstr "Друго"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Управник групе"
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index 138ac0e03ff..28760cfceb4 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/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-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 20:40+0000\n"
-"Last-Translator: Rancher <theranchcowboy@gmail.com>\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -214,8 +214,8 @@ msgid "Use TLS"
 msgstr "Користи TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Не користите за SSL везе јер неће радити."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index fd54f215b9b..dea4d27d067 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/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-01-30 00:23+0100\n"
-"PO-Revision-Date: 2013-01-29 23:23+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -51,7 +51,8 @@ msgid "No category to add?"
 msgstr ""
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
+#, php-format
+msgid "This category already exists: %s"
 msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
@@ -156,59 +157,59 @@ msgstr "Novembar"
 msgid "December"
 msgstr "Decembar"
 
-#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
+#: js/js.js:284
 msgid "Settings"
 msgstr "Podešavanja"
 
-#: js/js.js:762
+#: js/js.js:764
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:763
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:765
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:766
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:769
 msgid "today"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:770
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:772
 msgid "last month"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:774
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:773
+#: js/js.js:775
 msgid "last year"
 msgstr ""
 
-#: js/js.js:774
+#: js/js.js:776
 msgid "years ago"
 msgstr ""
 
@@ -467,7 +468,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr ""
 
@@ -477,71 +478,75 @@ msgid ""
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr ""
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Napravi <strong>administrativni nalog</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Napredno"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Facikla podataka"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Podešavanje baze"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "će biti korišćen"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Korisnik baze"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Lozinka baze"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Ime baze"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Domaćin baze"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Završi podešavanje"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:32
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Odjava"
 
@@ -563,14 +568,18 @@ msgstr ""
 msgid "Lost your password?"
 msgstr "Izgubili ste lozinku?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "upamti"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr ""
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "prethodno"
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index 84495465994..d0e6867e65e 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.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-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -18,46 +18,60 @@ 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/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Nema greške, fajl je uspešno poslat"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Poslati fajl prevazilazi direktivu MAX_FILE_SIZE koja je navedena u HTML formi"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Poslati fajl je samo delimično otpremljen!"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Nijedan fajl nije poslat"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Nedostaje privremena fascikla"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -69,11 +83,15 @@ msgstr "Fajlovi"
 msgid "Unshare"
 msgstr ""
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Obriši"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr ""
 
@@ -178,31 +196,31 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Zadnja izmena"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/sr@latin/files_trashbin.po b/l10n/sr@latin/files_trashbin.po
index 358a19f433b..1c241fa05a4 100644
--- a/l10n/sr@latin/files_trashbin.po
+++ b/l10n/sr@latin/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ 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"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Ime"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/sr@latin/files_versions.po b/l10n/sr@latin/files_versions.po
index a35cd43237b..d049a5e55bd 100644
--- a/l10n/sr@latin/files_versions.po
+++ b/l10n/sr@latin/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,10 +17,45 @@ 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/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 693e317cb93..f5f05886b64 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -22,6 +22,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Greška pri autentifikaciji"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr ""
@@ -46,10 +55,6 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Greška pri autentifikaciji"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr ""
@@ -112,7 +117,7 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr ""
 
@@ -189,67 +194,83 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Ne mogu da izmenim vašu lozinku"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Trenutna lozinka"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Nova lozinka"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "prikaži"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Izmeni lozinku"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -283,10 +304,6 @@ msgstr ""
 msgid "Other"
 msgstr "Drugo"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index 9933827859e..b53dc7e85e9 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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -213,7 +213,7 @@ msgid "Use TLS"
 msgstr ""
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
 #: templates/settings.php:39
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 0e7666126ff..dbcbf991dac 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -57,8 +57,9 @@ msgid "No category to add?"
 msgstr "Ingen kategori att lägga till?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Denna kategori finns redan:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -162,59 +163,59 @@ msgstr "November"
 msgid "December"
 msgstr "December"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Inställningar"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "sekunder sedan"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 minut sedan"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuter sedan"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "1 timme sedan"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{hours} timmar sedan"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} dagar sedan"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "förra månaden"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{months} månader sedan"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "månader sedan"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "förra året"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "år sedan"
 
@@ -473,7 +474,7 @@ msgstr "Redigera kategorier"
 msgid "Add"
 msgstr "Lägg till"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Säkerhetsvarning"
 
@@ -483,71 +484,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Ingen säker slumptalsgenerator finns tillgänglig. Du bör aktivera PHP OpenSSL-tillägget."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Utan en säker slumptalsgenerator kan angripare få möjlighet att förutsäga lösenordsåterställningar och ta över ditt konto."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Din datakatalog och dina filer är förmodligen tillgängliga från Internet. Den .htaccess-fil som ownCloud tillhandahåller fungerar inte. Vi rekommenderar starkt att du konfigurerar webbservern så att datakatalogen inte längre är tillgänglig eller att du flyttar datakatalogen utanför webbserverns dokument-root."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Skapa ett <strong>administratörskonto</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Datamapp"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Konfigurera databasen"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "kommer att användas"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Databasanvändare"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Lösenord till databasen"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Databasnamn"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Databas tabellutrymme"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Databasserver"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Avsluta installation"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "webbtjänster under din kontroll"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Logga ut"
 
@@ -569,14 +574,18 @@ msgstr "Ändra genast lösenord för att säkra ditt konto."
 msgid "Lost your password?"
 msgstr "Glömt ditt lösenord?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "kom ihåg"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Logga in"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "föregående"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 0cb97531859..1ca2ac1ef0e 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 02:10+0000\n"
-"Last-Translator: Lokal_Profil <lokal_profil@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,46 +24,60 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen fil uppladdad. Okänt fel"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Inga fel uppstod. Filen laddades upp utan problem"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Den uppladdade filen överskrider upload_max_filesize direktivet php.ini:"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Den uppladdade filen överstiger MAX_FILE_SIZE direktivet som anges i HTML-formulär"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Den uppladdade filen var endast delvis uppladdad"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Ingen fil blev uppladdad"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Saknar en tillfällig mapp"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Misslyckades spara till disk"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Inte tillräckligt med utrymme tillgängligt"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Felaktig mapp."
 
@@ -75,11 +89,15 @@ msgstr "Filer"
 msgid "Unshare"
 msgstr "Sluta dela"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Radera"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Byt namn"
 
@@ -184,31 +202,31 @@ msgstr "URL kan inte vara tom."
 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:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Storlek"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Ändrad"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 mapp"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} mappar"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} filer"
 
diff --git a/l10n/sv/files_encryption.po b/l10n/sv/files_encryption.po
index 1e4c8002b08..3c52fd72781 100644
--- a/l10n/sv/files_encryption.po
+++ b/l10n/sv/files_encryption.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# André <lokal_profil@hotmail.com>, 2013.
 # Magnus Höglund <magnus@linux.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 02:41+0000\n"
+"Last-Translator: Lokal_Profil <lokal_profil@hotmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,15 +47,15 @@ msgstr "Kryptering"
 
 #: templates/settings-personal.php:7
 msgid "File encryption is enabled."
-msgstr ""
+msgstr "Filkryptering är aktiverat."
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "Följande filtyper kommer inte att krypteras:"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "Exkludera följande filtyper från kryptering:"
 
 #: templates/settings.php:12
 msgid "None"
diff --git a/l10n/sv/files_trashbin.po b/l10n/sv/files_trashbin.po
index d68d5954fe2..177e741225d 100644
--- a/l10n/sv/files_trashbin.po
+++ b/l10n/sv/files_trashbin.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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,31 +18,45 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
+msgstr "utför återställning"
+
+#: js/trash.js:33
+msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Namn"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr "Raderad"
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 mapp"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} mappar"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} filer"
 
diff --git a/l10n/sv/files_versions.po b/l10n/sv/files_versions.po
index 5f3d273b389..5efefb7d136 100644
--- a/l10n/sv/files_versions.po
+++ b/l10n/sv/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Historik"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Versionshantering av filer"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 9891f7d1ec6..c51345d4304 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 00:50+0000\n"
-"Last-Translator: Lokal_Profil <lokal_profil@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,6 +30,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Kan inte ladda listan från App Store"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Autentiseringsfel"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Gruppen finns redan"
@@ -54,10 +63,6 @@ msgstr "Ogiltig e-post"
 msgid "Unable to delete group"
 msgstr "Kan inte radera grupp"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Autentiseringsfel"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Kan inte radera användare"
@@ -120,7 +125,7 @@ msgstr "Fel"
 msgid "Updated"
 msgstr "Uppdaterad"
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Sparar..."
 
@@ -197,67 +202,83 @@ msgstr "Ladda ner klient för Android"
 msgid "Download iOS Client"
 msgstr "Ladda ner klient för iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Lösenord"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Ditt lösenord har ändrats"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Kunde inte ändra ditt lösenord"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Nuvarande lösenord"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "visa"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Ändra lösenord"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Visat namn"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Din e-postadress"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Fyll i en e-postadress för att aktivera återställning av lösenord"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Hjälp att översätta"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Använd denna adress för att ansluta till ownCloud i din filhanterare"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Version"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -291,10 +312,6 @@ msgstr "Obegränsad"
 msgid "Other"
 msgstr "Annat"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr "Visat namn"
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Gruppadministratör"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 955753ff393..4eb8e55278d 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 14:20+0000\n"
-"Last-Translator: danielholm <admin@danielholm.se>\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -216,8 +216,8 @@ msgid "Use TLS"
 msgstr "Använd TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Använd inte för SSL-anslutningar, det kommer inte att fungera."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
new file mode 100644
index 00000000000..e6919ac84da
--- /dev/null
+++ b/l10n/sw_KE/core.po
@@ -0,0 +1,593 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sw_KE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:85
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:87
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:89
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:91
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
+#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
+msgid "Category type not provided."
+msgstr ""
+
+#: ajax/vcategories/add.php:30
+msgid "No category to add?"
+msgstr ""
+
+#: ajax/vcategories/add.php:37
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
+
+#: 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 ""
+
+#: ajax/vcategories/addToFavorites.php:30
+#: ajax/vcategories/removeFromFavorites.php:30
+#, php-format
+msgid "%s ID not provided."
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:35
+#, php-format
+msgid "Error adding %s to favorites."
+msgstr ""
+
+#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: ajax/vcategories/removeFromFavorites.php:35
+#, php-format
+msgid "Error removing %s from favorites."
+msgstr ""
+
+#: js/config.php:32
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:33
+msgid "January"
+msgstr ""
+
+#: js/config.php:33
+msgid "February"
+msgstr ""
+
+#: js/config.php:33
+msgid "March"
+msgstr ""
+
+#: js/config.php:33
+msgid "April"
+msgstr ""
+
+#: js/config.php:33
+msgid "May"
+msgstr ""
+
+#: js/config.php:33
+msgid "June"
+msgstr ""
+
+#: js/config.php:33
+msgid "July"
+msgstr ""
+
+#: js/config.php:33
+msgid "August"
+msgstr ""
+
+#: js/config.php:33
+msgid "September"
+msgstr ""
+
+#: js/config.php:33
+msgid "October"
+msgstr ""
+
+#: js/config.php:33
+msgid "November"
+msgstr ""
+
+#: js/config.php:33
+msgid "December"
+msgstr ""
+
+#: js/js.js:284
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:764
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:765
+msgid "1 minute ago"
+msgstr ""
+
+#: js/js.js:766
+msgid "{minutes} minutes ago"
+msgstr ""
+
+#: js/js.js:767
+msgid "1 hour ago"
+msgstr ""
+
+#: js/js.js:768
+msgid "{hours} hours ago"
+msgstr ""
+
+#: js/js.js:769
+msgid "today"
+msgstr ""
+
+#: js/js.js:770
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:771
+msgid "{days} days ago"
+msgstr ""
+
+#: js/js.js:772
+msgid "last month"
+msgstr ""
+
+#: js/js.js:773
+msgid "{months} months ago"
+msgstr ""
+
+#: js/js.js:774
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:775
+msgid "last year"
+msgstr ""
+
+#: js/js.js:776
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:126
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:162
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:163
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:180
+msgid "Ok"
+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
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
+msgid "Error"
+msgstr ""
+
+#: js/oc-vcategories.js:179
+msgid "The app name is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js:194
+msgid "The required file {file} is not installed!"
+msgstr ""
+
+#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
+msgid "Share"
+msgstr ""
+
+#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:152
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:159
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:168
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:170
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:175
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:180
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:183
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+msgid "Password"
+msgstr ""
+
+#: js/share.js:189
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:190
+msgid "Send"
+msgstr ""
+
+#: js/share.js:194
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:195
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:227
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:229
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:256
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:292
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:313
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:325
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:327
+msgid "access control"
+msgstr ""
+
+#: js/share.js:330
+msgid "create"
+msgstr ""
+
+#: js/share.js:333
+msgid "update"
+msgstr ""
+
+#: js/share.js:336
+msgid "delete"
+msgstr ""
+
+#: js/share.js:339
+msgid "share"
+msgstr ""
+
+#: js/share.js:373 js/share.js:558
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:571
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:583
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:598
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:609
+msgid "Email sent"
+msgstr ""
+
+#: js/update.js:14
+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 ""
+
+#: js/update.js:18
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:47
+msgid "ownCloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:28
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:16
+msgid "Add"
+msgstr ""
+
+#: templates/installation.php:23 templates/installation.php:30
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:24
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:25
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr ""
+
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:32
+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 ""
+
+#: templates/installation.php:36
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:52
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:54
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:61
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:113
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:117
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:125
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:131
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:136
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.guest.php:33
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:48
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:11
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:13
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:19
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:41
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:43
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr ""
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr ""
+
+#: templates/update.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
+msgstr ""
diff --git a/l10n/sw_KE/files.po b/l10n/sw_KE/files.po
new file mode 100644
index 00000000000..ed72da9980b
--- /dev/null
+++ b/l10n/sw_KE/files.po
@@ -0,0 +1,314 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sw_KE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:26
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:27
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in 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 ""
+
+#: ajax/upload.php:31
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:32
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:33
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:34
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:83
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:10
+msgid "Files"
+msgstr ""
+
+#: js/fileactions.js:117 templates/index.php:85 templates/index.php:86
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr ""
+
+#: js/fileactions.js:187
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:208 js/filelist.js:210
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/filelist.js:208 js/filelist.js:210
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:208
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:208 js/filelist.js:210
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:253
+msgid "replaced {new_name}"
+msgstr ""
+
+#: js/filelist.js:253 js/filelist.js:255
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:255
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
+
+#: js/filelist.js:280
+msgid "perform delete operation"
+msgstr ""
+
+#: js/files.js:52
+msgid "'.' is an invalid file name."
+msgstr ""
+
+#: js/files.js:56
+msgid "File name cannot be empty."
+msgstr ""
+
+#: js/files.js:64
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:224
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:261
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:261
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:278
+msgid "Close"
+msgstr ""
+
+#: js/files.js:297 js/files.js:413 js/files.js:444
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:317
+msgid "1 file uploading"
+msgstr ""
+
+#: js/files.js:320 js/files.js:375 js/files.js:390
+msgid "{count} files uploading"
+msgstr ""
+
+#: js/files.js:393 js/files.js:428
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:502
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:575
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/files.js:580
+msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
+msgstr ""
+
+#: js/files.js:953 templates/index.php:67
+msgid "Name"
+msgstr ""
+
+#: js/files.js:954 templates/index.php:78
+msgid "Size"
+msgstr ""
+
+#: js/files.js:955 templates/index.php:80
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:974
+msgid "1 folder"
+msgstr ""
+
+#: js/files.js:976
+msgid "{count} folders"
+msgstr ""
+
+#: js/files.js:984
+msgid "1 file"
+msgstr ""
+
+#: js/files.js:986
+msgid "{count} files"
+msgstr ""
+
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:20
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:22
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:26
+msgid "Save"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:12
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:14
+msgid "From link"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Trash"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:59
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:73
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:105
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:107
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:112
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:115
+msgid "Current scanning"
+msgstr ""
+
+#: templates/upgrade.php:2
+msgid "Upgrading filesystem cache..."
+msgstr ""
diff --git a/l10n/sw_KE/files_encryption.po b/l10n/sw_KE/files_encryption.po
new file mode 100644
index 00000000000..f168cce6dbb
--- /dev/null
+++ b/l10n/sw_KE/files_encryption.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-08 00:09+0100\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sw_KE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "None"
+msgstr ""
diff --git a/l10n/sw_KE/files_external.po b/l10n/sw_KE/files_external.po
new file mode 100644
index 00000000000..0c02d8edc5f
--- /dev/null
+++ b/l10n/sw_KE/files_external.po
@@ -0,0 +1,120 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-08 00:09+0100\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sw_KE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:73 js/google.js:72
+msgid "Fill out all required fields"
+msgstr ""
+
+#: js/dropbox.js:85
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:26 js/google.js:73 js/google.js:78
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: lib/config.php:405
+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 ""
+
+#: lib/config.php:406
+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 ""
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:8 templates/settings.php:22
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:144 templates/settings.php:145
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:124
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:125
+msgid "Allow users to mount their own external storage"
+msgstr ""
+
+#: templates/settings.php:136
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:153
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/sw_KE/files_sharing.po b/l10n/sw_KE/files_sharing.po
new file mode 100644
index 00000000000..adbbc6c0f03
--- /dev/null
+++ b/l10n/sw_KE/files_sharing.po
@@ -0,0 +1,48 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sw_KE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
+
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
+
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:29
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:35
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/sw_KE/files_trashbin.po b/l10n/sw_KE/files_trashbin.po
new file mode 100644
index 00000000000..91113e58ba9
--- /dev/null
+++ b/l10n/sw_KE/files_trashbin.po
@@ -0,0 +1,68 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sw_KE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
+msgid "perform restore operation"
+msgstr ""
+
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
+msgid "Name"
+msgstr ""
+
+#: js/trash.js:126 templates/index.php:27
+msgid "Deleted"
+msgstr ""
+
+#: js/trash.js:135
+msgid "1 folder"
+msgstr ""
+
+#: js/trash.js:137
+msgid "{count} folders"
+msgstr ""
+
+#: js/trash.js:145
+msgid "1 file"
+msgstr ""
+
+#: js/trash.js:147
+msgid "{count} files"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:20 templates/index.php:22
+msgid "Restore"
+msgstr ""
diff --git a/l10n/sw_KE/files_versions.po b/l10n/sw_KE/files_versions.po
new file mode 100644
index 00000000000..1194d23a785
--- /dev/null
+++ b/l10n/sw_KE/files_versions.po
@@ -0,0 +1,65 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sw_KE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr ""
diff --git a/l10n/sw_KE/lib.po b/l10n/sw_KE/lib.po
new file mode 100644
index 00000000000..2934a40eb6c
--- /dev/null
+++ b/l10n/sw_KE/lib.po
@@ -0,0 +1,156 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sw_KE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: app.php:313
+msgid "Help"
+msgstr ""
+
+#: app.php:320
+msgid "Personal"
+msgstr ""
+
+#: app.php:325
+msgid "Settings"
+msgstr ""
+
+#: app.php:330
+msgid "Users"
+msgstr ""
+
+#: app.php:337
+msgid "Apps"
+msgstr ""
+
+#: app.php:339
+msgid "Admin"
+msgstr ""
+
+#: files.php:202
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:203
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:203 files.php:228
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:227
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: helper.php:226
+msgid "couldn't be determined"
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:62 json.php:73
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: search/provider/file.php:17 search/provider/file.php:35
+msgid "Files"
+msgstr ""
+
+#: search/provider/file.php:26 search/provider/file.php:33
+msgid "Text"
+msgstr ""
+
+#: search/provider/file.php:29
+msgid "Images"
+msgstr ""
+
+#: template.php:113
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:114
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:115
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:116
+msgid "1 hour ago"
+msgstr ""
+
+#: template.php:117
+#, php-format
+msgid "%d hours ago"
+msgstr ""
+
+#: template.php:118
+msgid "today"
+msgstr ""
+
+#: template.php:119
+msgid "yesterday"
+msgstr ""
+
+#: template.php:120
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:121
+msgid "last month"
+msgstr ""
+
+#: template.php:122
+#, php-format
+msgid "%d months ago"
+msgstr ""
+
+#: template.php:123
+msgid "last year"
+msgstr ""
+
+#: template.php:124
+msgid "years ago"
+msgstr ""
+
+#: updater.php:75
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:77
+msgid "up to date"
+msgstr ""
+
+#: updater.php:80
+msgid "updates check is disabled"
+msgstr ""
+
+#: vcategories.php:188 vcategories.php:249
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po
new file mode 100644
index 00000000000..ebfabb7d98e
--- /dev/null
+++ b/l10n/sw_KE/settings.po
@@ -0,0 +1,328 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2011-07-25 16:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sw_KE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/apps/ocs.php:20
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/enableapp.php:11
+msgid "Could not enable app. "
+msgstr ""
+
+#: ajax/lostpassword.php:12
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:24
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/setlanguage.php:15
+msgid "Language changed"
+msgstr ""
+
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr ""
+
+#: ajax/togglegroups.php:28
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:34
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: ajax/updateapp.php:13
+msgid "Couldn't update app."
+msgstr ""
+
+#: js/apps.js:30
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:36 js/apps.js:76
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:36 js/apps.js:64
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:55
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:84
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:87
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:87
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:90
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:96
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:34 personal.php:35
+msgid "__language_name__"
+msgstr ""
+
+#: templates/apps.php:10
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:11
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:24
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:29
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/apps.php:31
+msgid "Update"
+msgstr ""
+
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
+
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
+
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
+
+#: templates/personal.php:8
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:12
+msgid "Clients"
+msgstr ""
+
+#: templates/personal.php:13
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:24
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:27
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:28
+msgid "show"
+msgstr ""
+
+#: templates/personal.php:29
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:56
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:57
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:63 templates/personal.php:64
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:69
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:74
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:85
+msgid "Version"
+msgstr ""
+
+#: templates/personal.php:87
+msgid ""
+"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>."
+msgstr ""
+
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
+msgid "Groups"
+msgstr ""
+
+#: templates/users.php:32
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:35
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:42 templates/users.php:142
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:60 templates/users.php:157
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
+msgid "Group Admin"
+msgstr ""
+
+#: templates/users.php:86
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:97
+msgid "change display name"
+msgstr ""
+
+#: templates/users.php:101
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:137
+msgid "Default"
+msgstr ""
+
+#: templates/users.php:165
+msgid "Delete"
+msgstr ""
diff --git a/l10n/sw_KE/user_ldap.po b/l10n/sw_KE/user_ldap.po
new file mode 100644
index 00000000000..2ef2872dc3f
--- /dev/null
+++ b/l10n/sw_KE/user_ldap.po
@@ -0,0 +1,309 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sw_KE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:35
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:37
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:40
+msgid ""
+"The configuration is invalid. Please look in the ownCloud log for further "
+"details."
+msgstr ""
+
+#: js/settings.js:66
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:82
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:97
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:121
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:126
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:136
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:137
+msgid "Confirm Deletion"
+msgstr ""
+
+#: templates/settings.php:8
+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
+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
+msgid "Server configuration"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:21
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:23
+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:24
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:25
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:25
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:26
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:26
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:34
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:35
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:36
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "When switched on, ownCloud will only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:38
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:38
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:39
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:41
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:47 templates/settings.php:50
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:49
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:49
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:50
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:56
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:58
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Help"
+msgstr ""
diff --git a/l10n/sw_KE/user_webdavauth.po b/l10n/sw_KE/user_webdavauth.po
new file mode 100644
index 00000000000..1e07c21030d
--- /dev/null
+++ b/l10n/sw_KE/user_webdavauth.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sw_KE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:7
+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 ""
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index 08005ae0930..a7f267a5770 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -51,8 +51,9 @@ msgid "No category to add?"
 msgstr "சேர்ப்பதற்கான வகைகள் இல்லையா?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "இந்த வகை ஏற்கனவே உள்ளது:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -156,59 +157,59 @@ msgstr "கார்த்திகை"
 msgid "December"
 msgstr "மார்கழி"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "அமைப்புகள்"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "செக்கன்களுக்கு முன்"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 நிமிடத்திற்கு முன் "
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{நிமிடங்கள்} நிமிடங்களுக்கு முன் "
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "1 மணித்தியாலத்திற்கு முன்"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{மணித்தியாலங்கள்} மணித்தியாலங்களிற்கு முன்"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "இன்று"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "நேற்று"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{நாட்கள்} நாட்களுக்கு முன்"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "கடந்த மாதம்"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{மாதங்கள்} மாதங்களிற்கு முன்"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "மாதங்களுக்கு முன்"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "கடந்த வருடம்"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "வருடங்களுக்கு முன்"
 
@@ -467,7 +468,7 @@ msgstr "வகைகளை தொகுக்க"
 msgid "Add"
 msgstr "சேர்க்க"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "பாதுகாப்பு எச்சரிக்கை"
 
@@ -477,71 +478,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "குறிப்பிட்ட எண்ணிக்கை பாதுகாப்பான புறப்பாக்கி / உண்டாக்கிகள் இல்லை, தயவுசெய்து PHP OpenSSL நீட்சியை இயலுமைப்படுத்துக. "
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "பாதுகாப்பான சீரற்ற எண்ணிக்கையான புறப்பாக்கி இல்லையெனின், தாக்குனரால் கடவுச்சொல் மீளமைப்பு அடையாளவில்லைகள் முன்மொழியப்பட்டு உங்களுடைய கணக்கை கைப்பற்றலாம்."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "உங்களுடைய தரவு அடைவு மற்றும் உங்களுடைய கோப்புக்களை பெரும்பாலும் இணையத்தினூடாக அணுகலாம். ownCloud இனால் வழங்கப்படுகின்ற .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>."
+msgstr ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "மேம்பட்ட"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "தரவு கோப்புறை"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "தரவுத்தளத்தை தகவமைக்க"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "பயன்படுத்தப்படும்"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "தரவுத்தள பயனாளர்"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "தரவுத்தள கடவுச்சொல்"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "தரவுத்தள பெயர்"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "தரவுத்தள அட்டவணை"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "தரவுத்தள ஓம்புனர்"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "அமைப்பை முடிக்க"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "உங்கள் கட்டுப்பாட்டின் கீழ் இணைய சேவைகள்"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "விடுபதிகை செய்க"
 
@@ -563,14 +568,18 @@ msgstr "உங்களுடைய கணக்கை மீண்டும்
 msgid "Lost your password?"
 msgstr "உங்கள் கடவுச்சொல்லை தொலைத்துவிட்டீர்களா?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "ஞாபகப்படுத்துக"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "புகுபதிகை"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "முந்தைய"
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index 392eb89ac49..71d8d03be36 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.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-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -18,46 +18,60 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "ஒரு கோப்பும் பதிவேற்றப்படவில்லை. அறியப்படாத வழு"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "இங்கு வழு இல்லை, கோப்பு வெற்றிகரமாக பதிவேற்றப்பட்டது"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "பதிவேற்றப்பட்ட கோப்பானது HTML  படிவத்தில் குறிப்பிடப்பட்டுள்ள MAX_FILE_SIZE  directive ஐ விட கூடியது"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "பதிவேற்றப்பட்ட கோப்பானது பகுதியாக மட்டுமே பதிவேற்றப்பட்டுள்ளது"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "எந்த கோப்பும் பதிவேற்றப்படவில்லை"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "ஒரு தற்காலிகமான கோப்புறையை காணவில்லை"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "வட்டில் எழுத முடியவில்லை"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -69,11 +83,15 @@ msgstr "கோப்புகள்"
 msgid "Unshare"
 msgstr "பகிரப்படாதது"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "அழிக்க"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "பெயர்மாற்றம்"
 
@@ -178,31 +196,31 @@ msgstr "URL  வெறுமையாக இருக்கமுடியாத
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "பெயர்"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "அளவு"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "மாற்றப்பட்டது"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 கோப்புறை"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{எண்ணிக்கை} கோப்புறைகள்"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 கோப்பு"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{எண்ணிக்கை} கோப்புகள்"
 
diff --git a/l10n/ta_LK/files_trashbin.po b/l10n/ta_LK/files_trashbin.po
index be19d3c7f33..731846dde06 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "பெயர்"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 கோப்புறை"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{எண்ணிக்கை} கோப்புறைகள்"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 கோப்பு"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{எண்ணிக்கை} கோப்புகள்"
 
diff --git a/l10n/ta_LK/files_versions.po b/l10n/ta_LK/files_versions.po
index ed417e58282..971b58bc8e7 100644
--- a/l10n/ta_LK/files_versions.po
+++ b/l10n/ta_LK/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "வரலாறு"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "கோப்பு பதிப்புகள்"
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index 04ffdaacb5e..6e3983c95c4 100644
--- a/l10n/ta_LK/settings.po
+++ b/l10n/ta_LK/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -22,6 +22,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "செயலி சேமிப்பிலிருந்து பட்டியலை ஏற்றமுடியாதுள்ளது"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "அத்தாட்சிப்படுத்தலில் வழு"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "குழு ஏற்கனவே உள்ளது"
@@ -46,10 +55,6 @@ msgstr "செல்லுபடியற்ற மின்னஞ்சல்"
 msgid "Unable to delete group"
 msgstr "குழுவை நீக்க முடியாது"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "அத்தாட்சிப்படுத்தலில் வழு"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "பயனாளரை நீக்க முடியாது"
@@ -112,7 +117,7 @@ msgstr "வழு"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "இயலுமைப்படுத்துக"
 
@@ -189,67 +194,83 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "உங்களுடைய கடவுச்சொல் மாற்றப்பட்டுள்ளது"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "உங்களுடைய கடவுச்சொல்லை மாற்றமுடியாது"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "தற்போதைய கடவுச்சொல்"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "புதிய கடவுச்சொல்"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "காட்டு"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "கடவுச்சொல்லை மாற்றுக"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "மின்னஞ்சல்"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "உங்களுடைய மின்னஞ்சல் முகவரி"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "கடவுச்சொல் மீள் பெறுவதை இயலுமைப்படுத்துவதற்கு மின்னஞ்சல் முகவரியை இயலுமைப்படுத்துக"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "மொழி"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "மொழிபெயர்க்க உதவி"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -283,10 +304,6 @@ msgstr ""
 msgid "Other"
 msgstr "மற்றவை"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "குழு நிர்வாகி"
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index c9b1c2c58d4..9e62a4a67e3 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -214,8 +214,8 @@ msgid "Use TLS"
 msgstr "TLS ஐ பயன்படுத்தவும்"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "SSL இணைப்பிற்கு பயன்படுத்தவேண்டாம், அது தோல்வியடையும்."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index f1afb42f0ee..43634de4b38 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\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"
@@ -50,7 +50,8 @@ msgid "No category to add?"
 msgstr ""
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
+#, php-format
+msgid "This category already exists: %s"
 msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
@@ -155,59 +156,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:760
+#: js/js.js:764
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:761
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:762
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:763
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:765
+#: js/js.js:769
 msgid "today"
 msgstr ""
 
-#: js/js.js:766
+#: js/js.js:770
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:772
 msgid "last month"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:774
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:775
 msgid "last year"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:776
 msgid "years ago"
 msgstr ""
 
@@ -466,7 +467,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr ""
 
@@ -476,71 +477,75 @@ msgid ""
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr ""
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr ""
 
@@ -570,6 +575,10 @@ msgstr ""
 msgid "Log in"
 msgstr ""
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 34bc7000c62..2ac9ac8686d 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\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,20 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -53,7 +67,7 @@ msgid "Failed to write to disk"
 msgstr ""
 
 #: ajax/upload.php:52
-msgid "Not enough space available"
+msgid "Not enough storage available"
 msgstr ""
 
 #: ajax/upload.php:83
@@ -68,11 +82,15 @@ msgstr ""
 msgid "Unshare"
 msgstr ""
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr ""
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr ""
 
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 7a06b3ede0a..e1cc407d59e 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\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 84e3ca4e992..0d4d620d98b 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\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 5de56c72e91..bf6ff52b50b 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\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 206be07e682..3f59bb32a0f 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\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,31 +17,45 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 94a37a83d03..80d8fa35cd9 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\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,10 +17,45 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 69d33a082d0..5c9b6e4cb88 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\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,27 +17,27 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: app.php:312
+#: app.php:313
 msgid "Help"
 msgstr ""
 
-#: app.php:319
+#: app.php:320
 msgid "Personal"
 msgstr ""
 
-#: app.php:324
+#: app.php:325
 msgid "Settings"
 msgstr ""
 
-#: app.php:329
+#: app.php:330
 msgid "Users"
 msgstr ""
 
-#: app.php:336
+#: app.php:337
 msgid "Apps"
 msgstr ""
 
-#: app.php:338
+#: app.php:339
 msgid "Admin"
 msgstr ""
 
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 40c9c5deb2c..0ed2c65e0db 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\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"
@@ -21,6 +21,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr ""
@@ -45,10 +54,6 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr ""
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr ""
@@ -111,7 +116,7 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr ""
 
@@ -217,39 +222,55 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:39
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:46 templates/personal.php:47
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:52
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:57
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:59
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
 "\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
@@ -282,10 +303,6 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 8e560cca7ce..d13915b5b5c 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\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"
@@ -212,7 +212,7 @@ msgid "Use TLS"
 msgstr ""
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
 #: templates/settings.php:39
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 9690e764a5c..1f3da3f43f9 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\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 e890f708a24..ae9a0125367 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-04 00:05+0100\n"
-"PO-Revision-Date: 2013-02-03 03:30+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,8 +52,9 @@ msgid "No category to add?"
 msgstr "ไม่มีหมวดหมู่ที่ต้องการเพิ่ม?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "หมวดหมู่นี้มีอยู่แล้ว: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -157,59 +158,59 @@ msgstr "พฤศจิกายน"
 msgid "December"
 msgstr "ธันวาคม"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "ตั้งค่า"
 
-#: js/js.js:760
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "วินาที ก่อนหน้านี้"
 
-#: js/js.js:761
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 นาทีก่อนหน้านี้"
 
-#: js/js.js:762
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} นาทีก่อนหน้านี้"
 
-#: js/js.js:763
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "1 ชั่วโมงก่อนหน้านี้"
 
-#: js/js.js:764
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{hours} ชั่วโมงก่อนหน้านี้"
 
-#: js/js.js:765
+#: js/js.js:769
 msgid "today"
 msgstr "วันนี้"
 
-#: js/js.js:766
+#: js/js.js:770
 msgid "yesterday"
 msgstr "เมื่อวานนี้"
 
-#: js/js.js:767
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{day} วันก่อนหน้านี้"
 
-#: js/js.js:768
+#: js/js.js:772
 msgid "last month"
 msgstr "เดือนที่แล้ว"
 
-#: js/js.js:769
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{months} เดือนก่อนหน้านี้"
 
-#: js/js.js:770
+#: js/js.js:774
 msgid "months ago"
 msgstr "เดือน ที่ผ่านมา"
 
-#: js/js.js:771
+#: js/js.js:775
 msgid "last year"
 msgstr "ปีที่แล้ว"
 
-#: js/js.js:772
+#: js/js.js:776
 msgid "years ago"
 msgstr "ปี ที่ผ่านมา"
 
@@ -468,7 +469,7 @@ msgstr "แก้ไขหมวดหมู่"
 msgid "Add"
 msgstr "เพิ่ม"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "คำเตือนเกี่ยวกับความปลอดภัย"
 
@@ -478,71 +479,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "ยังไม่มีตัวสร้างหมายเลขแบบสุ่มให้ใช้งาน, กรุณาเปิดใช้งานส่วนเสริม PHP OpenSSL"
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "หากปราศจากตัวสร้างหมายเลขแบบสุ่มที่ช่วยป้องกันความปลอดภัย ผู้บุกรุกอาจสามารถที่จะคาดคะเนรหัสยืนยันการเข้าถึงเพื่อรีเซ็ตรหัสผ่าน และเอาบัญชีของคุณไปเป็นของตนเองได้"
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "ไดเร็กทอรี่ข้อมูลและไฟล์ของคุณสามารถเข้าถึงได้จากอินเทอร์เน็ต ไฟล์ .htaccess ที่ ownCloud มีให้ไม่สามารถทำงานได้อย่างเหมาะสม เราขอแนะนำให้คุณกำหนดค่าเว็บเซิร์ฟเวอร์ใหม่ในรูปแบบที่ไดเร็กทอรี่เก็บข้อมูลไม่สามารถเข้าถึงได้อีกต่อไป หรือคุณได้ย้ายไดเร็กทอรี่ที่ใช้เก็บข้อมูลไปอยู่ภายนอกตำแหน่ง root ของเว็บเซิร์ฟเวอร์แล้ว"
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "ขั้นสูง"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "โฟลเดอร์เก็บข้อมูล"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "กำหนดค่าฐานข้อมูล"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "จะถูกใช้"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "ชื่อผู้ใช้งานฐานข้อมูล"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "รหัสผ่านฐานข้อมูล"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "ชื่อฐานข้อมูล"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "พื้นที่ตารางในฐานข้อมูล"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Database host"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "ติดตั้งเรียบร้อยแล้ว"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "web services under your control"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "ออกจากระบบ"
 
@@ -572,6 +577,10 @@ msgstr "จำรหัสผ่าน"
 msgid "Log in"
 msgstr "เข้าสู่ระบบ"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "ก่อนหน้า"
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 2ea3d92a701..2b84a1a3008 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-04 00:04+0100\n"
-"PO-Revision-Date: 2013-02-03 03:30+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +19,20 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "ยังไม่มีไฟล์ใดที่ถูกอัพโหลด เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ"
@@ -55,8 +69,8 @@ msgid "Failed to write to disk"
 msgstr "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว"
 
 #: ajax/upload.php:52
-msgid "Not enough space available"
-msgstr "มีพื้นที่เหลือไม่เพียงพอ"
+msgid "Not enough storage available"
+msgstr ""
 
 #: ajax/upload.php:83
 msgid "Invalid directory."
@@ -70,11 +84,15 @@ msgstr "ไฟล์"
 msgid "Unshare"
 msgstr "ยกเลิกการแชร์ข้อมูล"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "ลบ"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "เปลี่ยนชื่อ"
 
@@ -179,31 +197,31 @@ msgstr "URL ไม่สามารถเว้นว่างได้"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ชื่อโฟลเดอร์ไม่ถูกต้อง การใช้งาน 'แชร์' สงวนไว้สำหรับ Owncloud เท่านั้น"
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "ชื่อ"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "ขนาด"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "ปรับปรุงล่าสุด"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 โฟลเดอร์"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} โฟลเดอร์"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 ไฟล์"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} ไฟล์"
 
diff --git a/l10n/th_TH/files_trashbin.po b/l10n/th_TH/files_trashbin.po
index 86d6b648284..45c363a10ad 100644
--- a/l10n/th_TH/files_trashbin.po
+++ b/l10n/th_TH/files_trashbin.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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,31 +18,45 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr "ดำเนินการคืนค่า"
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "ชื่อ"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr "ลบแล้ว"
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 โฟลเดอร์"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} โฟลเดอร์"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 ไฟล์"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} ไฟล์"
 
diff --git a/l10n/th_TH/files_versions.po b/l10n/th_TH/files_versions.po
index c36c1b5941b..4d724184b1c 100644
--- a/l10n/th_TH/files_versions.po
+++ b/l10n/th_TH/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "ประวัติ"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "การกำหนดเวอร์ชั่นของไฟล์"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 21602086ef1..a04a575b536 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-04 00:05+0100\n"
-"PO-Revision-Date: 2013-02-03 03:30+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,6 +24,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "ไม่สามารถโหลดรายการจาก App Store ได้"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "มีกลุ่มดังกล่าวอยู่ในระบบอยู่แล้ว"
@@ -48,10 +57,6 @@ msgstr "อีเมลไม่ถูกต้อง"
 msgid "Unable to delete group"
 msgstr "ไม่สามารถลบกลุ่มได้"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "ไม่สามารถลบผู้ใช้งานได้"
@@ -114,7 +119,7 @@ msgstr "ข้อผิดพลาด"
 msgid "Updated"
 msgstr "อัพเดทแล้ว"
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "กำลังบันทึุกข้อมูล..."
 
@@ -191,67 +196,83 @@ msgstr "ดาวน์โหลดโปรแกรมไคลเอนต์
 msgid "Download iOS Client"
 msgstr "ดาวน์โหลดโปรแกรมไคลเอนต์สำหรับ iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "รหัสผ่านของคุณถูกเปลี่ยนแล้ว"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "รหัสผ่านปัจจุบัน"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "รหัสผ่านใหม่"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "แสดง"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "เปลี่ยนรหัสผ่าน"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "ชื่อที่ต้องการแสดง"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "อีเมล์"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "ที่อยู่อีเมล์ของคุณ"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "กรอกที่อยู่อีเมล์ของคุณเพื่อเปิดให้มีการกู้คืนรหัสผ่านได้"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "ภาษา"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "ช่วยกันแปล"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "ใช้ที่อยู่นี้เพื่อเชื่อมต่อกับ ownCloud ในโปรแกรมจัดการไฟล์ของคุณ"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "รุ่น"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -285,10 +306,6 @@ msgstr "ไม่จำกัดจำนวน"
 msgid "Other"
 msgstr "อื่นๆ"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr "ชื่อที่ต้องการแสดง"
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "ผู้ดูแลกลุ่ม"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index 549b4b971bc..3d906030931 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/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-02-04 00:05+0100\n"
-"PO-Revision-Date: 2013-02-03 04:40+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -214,8 +214,8 @@ msgid "Use TLS"
 msgstr "ใช้ TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "กรุณาอย่าใช้การเชื่อมต่อแบบ SSL การเชื่อมต่อจะเกิดการล้มเหลว"
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index ed983c565f0..e6ef436731d 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -55,8 +55,9 @@ msgid "No category to add?"
 msgstr "Eklenecek kategori yok?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Bu kategori zaten mevcut: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -160,59 +161,59 @@ msgstr "Kasım"
 msgid "December"
 msgstr "Aralık"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "saniye önce"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 dakika önce"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} dakika önce"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "1 saat önce"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{hours} saat önce"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "bugün"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "dün"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} gün önce"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "geçen ay"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{months} ay önce"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "ay önce"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "geçen yıl"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "yıl önce"
 
@@ -471,7 +472,7 @@ msgstr "Kategorileri düzenle"
 msgid "Add"
 msgstr "Ekle"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Güvenlik Uyarisi"
 
@@ -481,71 +482,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Güvenli rasgele sayı üreticisi bulunamadı. Lütfen PHP OpenSSL eklentisini etkinleştirin."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Güvenli rasgele sayı üreticisi olmadan saldırganlar parola sıfırlama simgelerini tahmin edip hesabınızı ele geçirebilir."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "data dizininiz ve dosyalarınız büyük ihtimalle internet üzerinden erişilebilir. Owncloud tarafından sağlanan .htaccess  dosyası çalışmıyor. Web sunucunuzu yapılandırarak data dizinine erişimi kapatmanızı veya data dizinini web sunucu döküman dizini dışına almanızı şiddetle tavsiye ederiz."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Bir <strong>yönetici hesabı</strong> oluşturun"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Veri klasörü"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Veritabanını ayarla"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "kullanılacak"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Veritabanı kullanıcı adı"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Veritabanı parolası"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Veritabanı adı"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Veritabanı tablo alanı"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Veritabanı sunucusu"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Kurulumu tamamla"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "kontrolünüzdeki web servisleri"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Çıkış yap"
 
@@ -567,14 +572,18 @@ msgstr "Hesabınızı korumak için lütfen parolanızı değiştirin."
 msgid "Lost your password?"
 msgstr "Parolanızı mı unuttunuz?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "hatırla"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Giriş yap"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "önceki"
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 322d36729b4..af033c86936 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -23,46 +23,60 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Dosya yüklenmedi. Bilinmeyen hata"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Bir hata yok, dosya başarıyla yüklendi"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Yüklenen dosya HTML formundaki MAX_FILE_SIZE sınırını aşıyor"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Yüklenen dosyanın sadece bir kısmı yüklendi"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Hiç dosya yüklenmedi"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Geçici bir klasör eksik"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Diske yazılamadı"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Yeterli disk alanı yok"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "Geçersiz dizin."
 
@@ -74,11 +88,15 @@ msgstr "Dosyalar"
 msgid "Unshare"
 msgstr "Paylaşılmayan"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Sil"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "İsim değiştir."
 
@@ -183,31 +201,31 @@ msgstr "URL boş olamaz."
 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:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Ad"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Boyut"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Değiştirilme"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 dizin"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} dizin"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 dosya"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} dosya"
 
diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po
index e987986453c..fff563d2bf9 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "İsim"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 dizin"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} dizin"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 dosya"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} dosya"
 
diff --git a/l10n/tr/files_versions.po b/l10n/tr/files_versions.po
index 6f30f6794a2..73c00cd9cf1 100644
--- a/l10n/tr/files_versions.po
+++ b/l10n/tr/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Geçmiş"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Dosya Sürümleri"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 15b5cc3f9e8..0b51576c5a3 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -25,6 +25,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "App Store'dan liste yüklenemiyor"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Eşleşme hata"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Grup zaten mevcut"
@@ -49,10 +58,6 @@ msgstr "Geçersiz eposta"
 msgid "Unable to delete group"
 msgstr "Grup silinemiyor"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Eşleşme hata"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Kullanıcı silinemiyor"
@@ -115,7 +120,7 @@ msgstr "Hata"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Kaydediliyor..."
 
@@ -192,67 +197,83 @@ msgstr "Android İstemcisini İndir"
 msgid "Download iOS Client"
 msgstr "iOS İstemcisini İndir"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Parola"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Şifreniz değiştirildi"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Parolanız değiştirilemiyor"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Mevcut parola"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Yeni parola"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "göster"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Parola değiştir"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Eposta"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Eposta adresiniz"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Parola sıfırlamayı aktifleştirmek için eposta adresi girin"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Dil"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Çevirilere yardım edin"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Sürüm"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -286,10 +307,6 @@ msgstr ""
 msgid "Other"
 msgstr "Diğer"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Yönetici Grubu "
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index 6a5f2430b1c..8cdf1507e90 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -214,8 +214,8 @@ msgid "Use TLS"
 msgstr "TLS kullan"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "SSL bağlantıları ile kullanmayın, başarısız olacaktır."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 5b2fb82733e..78e4e2d04ce 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -8,12 +8,13 @@
 # Soul Kim <warlock.rf@gmail.com>, 2012.
 #   <victor.dubiniuk@gmail.com>, 2012.
 #   <volodya327@gmail.com>, 2013.
+# пан Володимир <volodya327@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -55,8 +56,9 @@ msgid "No category to add?"
 msgstr "Відсутні категорії для додавання?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Ця категорія вже існує: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -160,59 +162,59 @@ msgstr "Листопад"
 msgid "December"
 msgstr "Грудень"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Налаштування"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "секунди тому"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 хвилину тому"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} хвилин тому"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "1 годину тому"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{hours} години тому"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "сьогодні"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "вчора"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} днів тому"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "минулого місяця"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{months} місяців тому"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "місяці тому"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "минулого року"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "роки тому"
 
@@ -261,7 +263,7 @@ msgstr "Поділитися"
 
 #: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
 msgid "Shared"
-msgstr ""
+msgstr "Опубліковано"
 
 #: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
@@ -384,11 +386,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 ""
+msgstr "Оновлення виконалось неуспішно. Будь ласка, повідомте про цю проблему в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">спільноті ownCloud</a>."
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "Оновлення виконалось успішно. Перенаправляємо вас на  ownCloud."
 
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
@@ -471,7 +473,7 @@ msgstr "Редагувати категорії"
 msgid "Add"
 msgstr "Додати"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Попередження про небезпеку"
 
@@ -481,71 +483,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Не доступний безпечний генератор випадкових чисел, будь ласка, активуйте PHP OpenSSL додаток."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "Без безпечного генератора випадкових чисел зловмисник може визначити токени скидання пароля і заволодіти Вашим обліковим записом."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Ваш каталог з даними та Ваші файли можливо доступні з Інтернету. Файл .htaccess, наданий з ownCloud, не працює. Ми наполегливо рекомендуємо Вам налаштувати свій веб-сервер таким чином, щоб каталог data більше не був доступний, або перемістити каталог data за межі кореневого каталогу документів веб-сервера."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Створити <strong>обліковий запис адміністратора</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Додатково"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Каталог даних"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Налаштування бази даних"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "буде використано"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Користувач бази даних"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Пароль для бази даних"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Назва бази даних"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Таблиця бази даних"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Хост бази даних"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Завершити налаштування"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "веб-сервіс під вашим контролем"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Вихід"
 
@@ -567,14 +573,18 @@ msgstr "Будь ласка, змініть свій пароль, щоб зно
 msgid "Lost your password?"
 msgstr "Забули пароль?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "запам'ятати"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Вхід"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr "Альтернативні Логіни"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "попередній"
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 97c4a8121ed..44b18cb87c9 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -6,12 +6,13 @@
 #   <dzubchikd@gmail.com>, 2012.
 #   <skoptev@ukr.net>, 2012.
 # Soul Kim <warlock.rf@gmail.com>, 2012.
+# пан Володимир <volodya327@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -20,48 +21,62 @@ 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/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Не завантажено жодного файлу. Невідома помилка"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Файл успішно вивантажено без помилок."
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Розмір звантаження перевищує upload_max_filesize параметра в php.ini: "
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Розмір відвантаженого файлу перевищує директиву MAX_FILE_SIZE вказану в HTML формі"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Файл відвантажено лише частково"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Не відвантажено жодного файлу"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Відсутній тимчасовий каталог"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Невдалося записати на диск"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
-msgstr ""
+msgstr "Невірний каталог."
 
 #: appinfo/app.php:10
 msgid "Files"
@@ -71,11 +86,15 @@ msgstr "Файли"
 msgid "Unshare"
 msgstr "Заборонити доступ"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr "Видалити назавжди"
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Видалити"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Перейменувати"
 
@@ -109,15 +128,15 @@ msgstr "замінено {new_name} на {old_name}"
 
 #: js/filelist.js:280
 msgid "perform delete operation"
-msgstr ""
+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 ""
@@ -127,17 +146,17 @@ 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 ""
+msgstr "Ваше сховище майже повне ({usedSpacePercent}%)"
 
 #: js/files.js:224
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr ""
+msgstr "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі."
 
 #: js/files.js:261
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
@@ -178,33 +197,33 @@ msgstr "URL не може бути пустим."
 
 #: js/files.js:580
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Невірне ім'я теки. Використання \"Shared\" зарезервовано Owncloud"
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Ім'я"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Розмір"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Змінено"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} папок"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} файлів"
 
@@ -262,7 +281,7 @@ msgstr "З посилання"
 
 #: templates/index.php:40
 msgid "Trash"
-msgstr ""
+msgstr "Смітник"
 
 #: templates/index.php:46
 msgid "Cancel upload"
@@ -296,4 +315,4 @@ msgstr "Поточне сканування"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "Оновлення кеша файлової системи..."
diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po
index 7e9614c45d4..b33723c8702 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ 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"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Ім'я"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} папок"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} файлів"
 
diff --git a/l10n/uk/files_versions.po b/l10n/uk/files_versions.po
index 1a8bb981db6..a511f9ae557 100644
--- a/l10n/uk/files_versions.po
+++ b/l10n/uk/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,10 +18,45 @@ 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/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Історія"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Версії файлів"
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index bfce5870201..1646712c697 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -6,13 +6,14 @@
 #   <dzubchikd@gmail.com>, 2012.
 #   <skoptev@ukr.net>, 2012.
 #   <volodya327@gmail.com>, 2012-2013.
+# пан Володимир <volodya327@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 15:20+0000\n"
+"Last-Translator: volodya327 <volodya327@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,6 +25,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Не вдалося завантажити список з App Store"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Помилка автентифікації"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr "Не вдалося змінити зображене ім'я"
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Група вже існує"
@@ -48,10 +58,6 @@ msgstr "Невірна адреса"
 msgid "Unable to delete group"
 msgstr "Не вдалося видалити групу"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Помилка автентифікації"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Не вдалося видалити користувача"
@@ -80,11 +86,11 @@ msgstr "Не вдалося видалити користувача із гру�
 
 #: ajax/updateapp.php:13
 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"
@@ -96,15 +102,15 @@ msgstr "Включити"
 
 #: js/apps.js:55
 msgid "Please wait...."
-msgstr ""
+msgstr "Зачекайте, будь ласка..."
 
 #: js/apps.js:84
 msgid "Updating...."
-msgstr ""
+msgstr "Оновлюється..."
 
 #: js/apps.js:87
 msgid "Error while updating app"
-msgstr ""
+msgstr "Помилка при оновленні програми"
 
 #: js/apps.js:87
 msgid "Error"
@@ -112,9 +118,9 @@ msgstr "Помилка"
 
 #: js/apps.js:90
 msgid "Updated"
-msgstr ""
+msgstr "Оновлено"
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Зберігаю..."
 
@@ -191,67 +197,83 @@ msgstr "Завантажити клієнт для Android"
 msgid "Download iOS Client"
 msgstr "Завантажити клієнт для iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Ваш пароль змінено"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Не вдалося змінити Ваш пароль"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Поточний пароль"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Новий пароль"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "показати"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Змінити пароль"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Показати Ім'я"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr "Ваше ім'я було змінене"
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr "Неможливо змінити ваше зображене ім'я"
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr "Змінити зображене ім'я"
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Ел.пошта"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Ваша адреса електронної пошти"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Введіть адресу електронної пошти для відновлення паролю"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Мова"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Допомогти з перекладом"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Використовуйте цю адресу для під'єднання до вашого ownCloud у вашому файловому менеджері"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "Версія"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -263,7 +285,7 @@ msgstr "Розроблено <a href=\"http://ownCloud.org/contact\" target=\"_b
 
 #: templates/users.php:21 templates/users.php:79
 msgid "Login Name"
-msgstr ""
+msgstr "Ім'я Логіну"
 
 #: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
@@ -285,10 +307,6 @@ msgstr "Необмежено"
 msgid "Other"
 msgstr "Інше"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Адміністратор групи"
@@ -299,11 +317,11 @@ msgstr "Сховище"
 
 #: templates/users.php:97
 msgid "change display name"
-msgstr ""
+msgstr "змінити зображене ім'я"
 
 #: templates/users.php:101
 msgid "set new password"
-msgstr ""
+msgstr "встановити новий пароль"
 
 #: templates/users.php:137
 msgid "Default"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index 709ba9d797f..2b1bfc0ad9d 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -5,12 +5,13 @@
 # Translators:
 #   <victor.dubiniuk@gmail.com>, 2012.
 #   <volodya327@gmail.com>, 2012.
+# пан Володимир <volodya327@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -21,23 +22,23 @@ msgstr ""
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Не вдалося видалити конфігурацію сервера"
 
 #: ajax/testConfiguration.php:35
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "Конфігурація вірна і зв'язок може бути встановлений ​​!"
 
 #: ajax/testConfiguration.php:37
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr ""
+msgstr "Конфігурація вірна, але встановити зв'язок не вдалося. Будь ласка, перевірте налаштування сервера і облікові дані."
 
 #: ajax/testConfiguration.php:40
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr ""
+msgstr "Конфігурація невірна. Подробиці подивіться, будь ласка, в журналі ownCloud."
 
 #: js/settings.js:66
 msgid "Deletion failed"
@@ -45,31 +46,31 @@ msgstr "Видалення не було виконано"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "Застосувати налаштування  з останньої конфігурації сервера ?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr ""
+msgstr "Зберегти налаштування ?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
-msgstr ""
+msgstr "Неможливо додати конфігурацію сервера"
 
 #: js/settings.js:121
 msgid "Connection test succeeded"
-msgstr ""
+msgstr "Перевірка з'єднання пройшла успішно"
 
 #: js/settings.js:126
 msgid "Connection test failed"
-msgstr ""
+msgstr "Перевірка з'єднання завершилась неуспішно"
 
 #: js/settings.js:136
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "Ви дійсно бажаєте видалити поточну конфігурацію сервера ?"
 
 #: js/settings.js:137
 msgid "Confirm Deletion"
-msgstr ""
+msgstr "Підтвердіть Видалення"
 
 #: templates/settings.php:8
 msgid ""
@@ -82,15 +83,15 @@ msgstr "<b>Увага:</b> Застосунки user_ldap та user_webdavauth �
 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 ""
+msgstr "<b>Увага:</ b> Потрібний модуль PHP LDAP не встановлено, базова програма працювати не буде. Будь ласка, зверніться до системного адміністратора, щоб встановити його."
 
 #: templates/settings.php:15
 msgid "Server configuration"
-msgstr ""
+msgstr "Налаштування Сервера"
 
 #: templates/settings.php:17
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "Додати налаштування Сервера"
 
 #: templates/settings.php:21
 msgid "Host"
@@ -107,7 +108,7 @@ msgstr "Базовий DN"
 
 #: templates/settings.php:22
 msgid "One Base DN per line"
-msgstr ""
+msgstr "Один Base DN на одній строчці"
 
 #: templates/settings.php:22
 msgid "You can specify Base DN for users and groups in the Advanced tab"
@@ -178,11 +179,11 @@ msgstr ""
 
 #: templates/settings.php:33
 msgid "Configuration Active"
-msgstr ""
+msgstr "Налаштування Активне"
 
 #: templates/settings.php:33
 msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "Якщо \"галочка\" знята, ця конфігурація буде пропущена."
 
 #: templates/settings.php:34
 msgid "Port"
@@ -215,8 +216,8 @@ msgid "Use TLS"
 msgstr "Використовуйте TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Не використовуйте його для SSL з'єднань, це не буде виконано."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
@@ -258,7 +259,7 @@ msgstr "Основне Дерево Користувачів"
 
 #: templates/settings.php:46
 msgid "One User Base DN per line"
-msgstr ""
+msgstr "Один Користувач Base DN на одній строчці"
 
 #: templates/settings.php:47
 msgid "User Search Attributes"
@@ -282,7 +283,7 @@ msgstr "Основне Дерево Груп"
 
 #: templates/settings.php:49
 msgid "One Group Base DN per line"
-msgstr ""
+msgstr "Одна Група Base DN на одній строчці"
 
 #: templates/settings.php:50
 msgid "Group Search Attributes"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 15751465673..012e1202e95 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -55,8 +55,9 @@ msgid "No category to add?"
 msgstr "Không có danh mục được thêm?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Danh mục này đã được tạo :"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -160,59 +161,59 @@ msgstr "Tháng 11"
 msgid "December"
 msgstr "Tháng 12"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "Cài đặt"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "vài giây trước"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 phút trước"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} phút trước"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "1 giờ trước"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{hours} giờ trước"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "hôm nay"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "hôm qua"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} ngày trước"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "tháng trước"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{months} tháng trước"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "tháng trước"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "năm trước"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "năm trước"
 
@@ -471,7 +472,7 @@ msgstr "Sửa thể loại"
 msgid "Add"
 msgstr "Thêm"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "Cảnh bảo bảo mật"
 
@@ -481,71 +482,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "Không an toàn ! chức năng random number generator đã có sẵn ,vui lòng bật  PHP OpenSSL extension."
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "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."
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "Thư mục dữ liệu và những tập tin của bạn có thể dễ dàng bị truy cập từ mạng. Tập tin .htaccess do ownCloud cung cấp không hoạt động. Chúng tôi đề nghị bạn nên cấu hình lại máy chủ web để thư mục dữ liệu không còn bị truy cập hoặc bạn nên di chuyển thư mục dữ liệu ra bên ngoài thư mục gốc của máy chủ."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Tạo một <strong>tài khoản quản trị</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "Nâng cao"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "Thư mục dữ liệu"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "Cấu hình cơ sở dữ liệu"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "được sử dụng"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Người dùng cơ sở dữ liệu"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "Mật khẩu cơ sở dữ liệu"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "Tên cơ sở dữ liệu"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "Cơ sở dữ liệu tablespace"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "Database host"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "Cài đặt hoàn tất"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "các dịch vụ web dưới sự kiểm soát của bạn"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "Đăng xuất"
 
@@ -567,14 +572,18 @@ msgstr "Vui lòng thay đổi mật khẩu của bạn để đảm bảo tài k
 msgid "Lost your password?"
 msgstr "Bạn quên mật khẩu ?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "ghi nhớ"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "Đăng nhập"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "Lùi lại"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index 44b47a64cd2..131a491428d 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -21,46 +21,60 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: 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"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "Không có lỗi, các tập tin đã được tải lên thành công"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Kích thước những tập tin tải lên vượt quá MAX_FILE_SIZE đã được quy định"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "Tập tin tải lên mới chỉ tải lên được một phần"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "Không có tập tin nào được tải lên"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "Không tìm thấy thư mục tạm"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "Không thể ghi "
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -72,11 +86,15 @@ msgstr "Tập tin"
 msgid "Unshare"
 msgstr "Không chia sẽ"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Xóa"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "Sửa tên"
 
@@ -181,31 +199,31 @@ msgstr "URL không được để trống."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "Tên"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "Kích cỡ"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "Thay đổi"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 thư mục"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} thư mục"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 tập tin"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} tập tin"
 
diff --git a/l10n/vi/files_trashbin.po b/l10n/vi/files_trashbin.po
index 696681bd68a..3d2b604621f 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "Tên"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 thư mục"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} thư mục"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 tập tin"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} tập tin"
 
diff --git a/l10n/vi/files_versions.po b/l10n/vi/files_versions.po
index 4de9dbf8467..9ebe3a80d4b 100644
--- a/l10n/vi/files_versions.po
+++ b/l10n/vi/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -19,10 +19,45 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "Lịch sử"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Phiên bản tập tin"
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index d7a5c629f52..a8cdfa2fbb9 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -27,6 +27,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Không thể tải danh sách ứng dụng từ App Store"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Lỗi xác thực"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Nhóm đã tồn tại"
@@ -51,10 +60,6 @@ msgstr "Email không hợp lệ"
 msgid "Unable to delete group"
 msgstr "Không thể xóa nhóm"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Lỗi xác thực"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Không thể xóa người dùng"
@@ -117,7 +122,7 @@ msgstr "Lỗi"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "Đang tiến hành lưu ..."
 
@@ -194,67 +199,83 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "Mật khẩu của bạn đã được thay đổi."
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "Không thể đổi mật khẩu"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "Mật khẩu cũ"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "Mật khẩu mới "
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "Hiện"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "Đổi mật khẩu"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "Email của bạn"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "Nhập địa chỉ email của bạn để khôi phục lại mật khẩu"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "Ngôn ngữ"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "Hỗ trợ dịch thuật"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -288,10 +309,6 @@ msgstr ""
 msgid "Other"
 msgstr "Khác"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Nhóm quản trị"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index d067549c1d8..fb97cfd9a49 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -215,8 +215,8 @@ msgid "Use TLS"
 msgstr "Sử dụng TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Kết nối SSL bị lỗi. "
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index 514f8d534c9..1d9bf29559f 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -52,8 +52,9 @@ msgid "No category to add?"
 msgstr "没有分类添加了?"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "这个分类已经存在了:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -157,59 +158,59 @@ msgstr "十一月"
 msgid "December"
 msgstr "十二月"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "秒前"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 分钟前"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} 分钟前"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} 天前"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "上个月"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "月前"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "年前"
 
@@ -468,7 +469,7 @@ msgstr "编辑分类"
 msgid "Add"
 msgstr "添加"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "安全警告"
 
@@ -478,71 +479,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "没有安全随机码生成器，请启用 PHP OpenSSL 扩展。"
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "没有安全随机码生成器，黑客可以预测密码重置令牌并接管你的账户。"
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "您的数据文件夹和您的文件或许能够从互联网访问。ownCloud 提供的 .htaccesss 文件未其作用。我们强烈建议您配置网络服务器以使数据文件夹不能从互联网访问，或将移动数据文件夹移出网络服务器文档根目录。"
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "建立一个 <strong>管理帐户</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "进阶"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "数据存放文件夹"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "配置数据库"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "将会使用"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "数据库用户"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "数据库密码"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "数据库用户名"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "数据库表格空间"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "数据库主机"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "完成安装"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "你控制下的网络服务"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "注销"
 
@@ -564,14 +569,18 @@ msgstr "请修改您的密码以保护账户。"
 msgid "Lost your password?"
 msgstr "忘记密码?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "备忘"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "登陆"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "后退"
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index 71d9b048220..000f4c3195c 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.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-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -19,46 +19,60 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "没有上传文件。未知错误"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "没有任何错误,文件上传成功了"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "上传的文件超过了HTML表单指定的MAX_FILE_SIZE"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "文件只有部分被上传"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "没有上传完成的文件"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "丢失了一个临时文件夹"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "写磁盘失败"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -70,11 +84,15 @@ msgstr "文件"
 msgid "Unshare"
 msgstr "取消共享"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "删除"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "重命名"
 
@@ -179,31 +197,31 @@ msgstr "网址不能为空。"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "名字"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 个文件夹"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} 个文件"
 
diff --git a/l10n/zh_CN.GB2312/files_trashbin.po b/l10n/zh_CN.GB2312/files_trashbin.po
index 722b4a5f8cb..cc9c96f2f06 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "名称"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 个文件夹"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} 个文件"
 
diff --git a/l10n/zh_CN.GB2312/files_versions.po b/l10n/zh_CN.GB2312/files_versions.po
index 7676ba278c2..97402cab1a7 100644
--- a/l10n/zh_CN.GB2312/files_versions.po
+++ b/l10n/zh_CN.GB2312/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "历史"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "文件版本"
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index 6aa5df48618..3335b000123 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -23,6 +23,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "不能从App Store 中加载列表"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "认证错误"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "群组已存在"
@@ -47,10 +56,6 @@ msgstr "非法Email"
 msgid "Unable to delete group"
 msgstr "未能删除群组"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "认证错误"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "未能删除用户"
@@ -113,7 +118,7 @@ msgstr "出错"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "保存中..."
 
@@ -190,67 +195,83 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "密码"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "您的密码以变更"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "不能改变你的密码"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "现在的密码"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "新密码"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "展示"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "改变密码"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "你的email地址"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "输入一个邮箱地址以激活密码恢复功能"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "语言"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "帮助翻译"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -284,10 +305,6 @@ msgstr ""
 msgid "Other"
 msgstr "其他的"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "群组管理员"
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index bc915483e99..f85d4abe78f 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/user_ldap.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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -214,8 +214,8 @@ msgid "Use TLS"
 msgstr "使用 TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "不要使用它进行 SSL 连接，会失败的。"
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index c216b30e765..be5884a2777 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -56,8 +56,9 @@ msgid "No category to add?"
 msgstr "没有可添加分类？"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "此分类已存在: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -161,59 +162,59 @@ msgstr "十一月"
 msgid "December"
 msgstr "十二月"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "秒前"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "一分钟前"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} 分钟前"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "1小时前"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{hours} 小时前"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} 天前"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "上月"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{months} 月前"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "月前"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "年前"
 
@@ -472,7 +473,7 @@ msgstr "编辑分类"
 msgid "Add"
 msgstr "添加"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "安全警告"
 
@@ -482,71 +483,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "随机数生成器无效，请启用PHP的OpenSSL扩展"
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "没有安全随机码生成器，攻击者可能会猜测密码重置信息从而窃取您的账户"
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器根目录以外。"
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "创建<strong>管理员账号</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "高级"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "数据目录"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "配置数据库"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "将被使用"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "数据库用户"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "数据库密码"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "数据库名"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "数据库表空间"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "数据库主机"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "安装完成"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "由您掌控的网络服务"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "注销"
 
@@ -568,14 +573,18 @@ msgstr "请修改您的密码，以保护您的账户安全。"
 msgid "Lost your password?"
 msgstr "忘记密码？"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "记住"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "登录"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "上一页"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index b52527396da..8fe77aaf115 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -24,46 +24,60 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "没有文件被上传。未知错误"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "没有发生错误，文件上传成功。"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "上传文件大小已超过php.ini中upload_max_filesize所规定的值"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "上传的文件超过了在HTML 表单中指定的MAX_FILE_SIZE"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "只上传了文件的一部分"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "文件没有上传"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "缺少临时目录"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "写入磁盘失败"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "没有足够可用空间"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "无效文件夹。"
 
@@ -75,11 +89,15 @@ msgstr "文件"
 msgid "Unshare"
 msgstr "取消分享"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "删除"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "重命名"
 
@@ -184,31 +202,31 @@ msgstr "URL不能为空"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "无效文件夹名。'共享' 是 Owncloud 预留的文件夹名。"
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "名称"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1个文件夹"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} 个文件"
 
diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po
index 71b559d7bac..2d95abe67ee 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "名称"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1个文件夹"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} 个文件"
 
diff --git a/l10n/zh_CN/files_versions.po b/l10n/zh_CN/files_versions.po
index 8427a53caaf..fef8172901c 100644
--- a/l10n/zh_CN/files_versions.po
+++ b/l10n/zh_CN/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "历史"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "文件版本"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 123e52ea0ab..51c13db8795 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -27,6 +27,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "无法从应用商店载入列表"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "认证错误"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "已存在该组"
@@ -51,10 +60,6 @@ msgstr "无效的电子邮件"
 msgid "Unable to delete group"
 msgstr "无法删除组"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "认证错误"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "无法删除用户"
@@ -117,7 +122,7 @@ msgstr "错误"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "正在保存"
 
@@ -194,67 +199,83 @@ msgstr "下载 Android 客户端"
 msgid "Download iOS Client"
 msgstr "下载 iOS 客户端"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "密码"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "密码已修改"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "无法修改密码"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "当前密码"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "新密码"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "显示"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "修改密码"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "电子邮件"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "您的电子邮件"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "填写电子邮件地址以启用密码恢复功能"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "语言"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "帮助翻译"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "用该地址来连接文件管理器中的 ownCloud"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "版本"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -288,10 +309,6 @@ msgstr "无限"
 msgid "Other"
 msgstr "其它"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "组管理员"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 18eef3d02f9..1f5920201f9 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -215,8 +215,8 @@ msgid "Use TLS"
 msgstr "使用TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "不要在SSL链接中使用此选项，会导致失败。"
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index d6ed7429225..65b41b0aeee 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/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-01-30 00:23+0100\n"
-"PO-Revision-Date: 2013-01-29 23:23+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
@@ -51,7 +51,8 @@ msgid "No category to add?"
 msgstr ""
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
+#, php-format
+msgid "This category already exists: %s"
 msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
@@ -156,59 +157,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
+#: js/js.js:284
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:762
+#: js/js.js:764
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:763
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:765
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:766
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:767
+#: js/js.js:769
 msgid "today"
 msgstr ""
 
-#: js/js.js:768
+#: js/js.js:770
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:770
+#: js/js.js:772
 msgid "last month"
 msgstr ""
 
-#: js/js.js:771
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:772
+#: js/js.js:774
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:773
+#: js/js.js:775
 msgid "last year"
 msgstr ""
 
-#: js/js.js:774
+#: js/js.js:776
 msgid "years ago"
 msgstr ""
 
@@ -467,7 +468,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr ""
 
@@ -477,71 +478,75 @@ msgid ""
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr ""
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:32
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr ""
 
@@ -563,14 +568,18 @@ msgstr ""
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr ""
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr ""
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index 3a61b47c5ad..172bdcbcee4 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-01-31 17:02+0100\n"
-"PO-Revision-Date: 2013-01-31 16:02+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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,46 +17,60 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -68,11 +82,15 @@ msgstr ""
 msgid "Unshare"
 msgstr ""
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr ""
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr ""
 
@@ -177,31 +195,31 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/zh_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po
index 694862fdd6b..4d462824758 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/zh_HK/files_versions.po b/l10n/zh_HK/files_versions.po
index 4859a33c5a0..0b4229496a9 100644
--- a/l10n/zh_HK/files_versions.po
+++ b/l10n/zh_HK/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,10 +17,45 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index 58568a1c6e0..e9501109c5a 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
@@ -21,6 +21,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr ""
@@ -45,10 +54,6 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr ""
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr ""
@@ -111,7 +116,7 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr ""
 
@@ -188,67 +193,83 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr ""
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -282,10 +303,6 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index cda8b305dea..3d9f862dc9b 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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -213,7 +213,7 @@ msgid "Use TLS"
 msgstr ""
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
 #: templates/settings.php:39
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index b7347e7ad74..e060611cd6a 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 13:30+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,8 +55,9 @@ msgid "No category to add?"
 msgstr "沒有可增加的分類？"
 
 #: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "此分類已經存在："
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -160,59 +161,59 @@ msgstr "十一月"
 msgid "December"
 msgstr "十二月"
 
-#: js/js.js:280
+#: js/js.js:284
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:759
+#: js/js.js:764
 msgid "seconds ago"
 msgstr "幾秒前"
 
-#: js/js.js:760
+#: js/js.js:765
 msgid "1 minute ago"
 msgstr "1 分鐘前"
 
-#: js/js.js:761
+#: js/js.js:766
 msgid "{minutes} minutes ago"
 msgstr "{minutes} 分鐘前"
 
-#: js/js.js:762
+#: js/js.js:767
 msgid "1 hour ago"
 msgstr "1 個小時前"
 
-#: js/js.js:763
+#: js/js.js:768
 msgid "{hours} hours ago"
 msgstr "{hours} 小時前"
 
-#: js/js.js:764
+#: js/js.js:769
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:765
+#: js/js.js:770
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:766
+#: js/js.js:771
 msgid "{days} days ago"
 msgstr "{days} 天前"
 
-#: js/js.js:767
+#: js/js.js:772
 msgid "last month"
 msgstr "上個月"
 
-#: js/js.js:768
+#: js/js.js:773
 msgid "{months} months ago"
 msgstr "{months} 個月前"
 
-#: js/js.js:769
+#: js/js.js:774
 msgid "months ago"
 msgstr "幾個月前"
 
-#: js/js.js:770
+#: js/js.js:775
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:771
+#: js/js.js:776
 msgid "years ago"
 msgstr "幾年前"
 
@@ -471,7 +472,7 @@ msgstr "編輯分類"
 msgid "Add"
 msgstr "增加"
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
 msgid "Security Warning"
 msgstr "安全性警告"
 
@@ -481,71 +482,75 @@ msgid ""
 "OpenSSL extension."
 msgstr "沒有可用的亂數產生器，請啟用 PHP 中的 OpenSSL 擴充功能。"
 
-#: templates/installation.php:26
+#: templates/installation.php:25
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "若沒有安全的亂數產生器，攻擊者可能可以預測密碼重設信物，然後控制您的帳戶。"
 
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
 #: templates/installation.php:32
 msgid ""
-"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."
-msgstr "您的資料目錄 (Data Directory) 和檔案可能可以由網際網路上面公開存取。Owncloud 所提供的 .htaccess 設定檔並未生效，我們強烈建議您設定您的網頁伺服器以防止資料目錄被公開存取，或將您的資料目錄移出網頁伺服器的 document root 。"
+"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 ""
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "建立一個<strong>管理者帳號</strong>"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Advanced"
 msgstr "進階"
 
-#: templates/installation.php:52
+#: templates/installation.php:54
 msgid "Data folder"
 msgstr "資料夾"
 
-#: templates/installation.php:59
+#: templates/installation.php:61
 msgid "Configure the database"
 msgstr "設定資料庫"
 
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
 msgid "will be used"
 msgstr "將會使用"
 
-#: templates/installation.php:107
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "資料庫使用者"
 
-#: templates/installation.php:111
+#: templates/installation.php:113
 msgid "Database password"
 msgstr "資料庫密碼"
 
-#: templates/installation.php:115
+#: templates/installation.php:117
 msgid "Database name"
 msgstr "資料庫名稱"
 
-#: templates/installation.php:123
+#: templates/installation.php:125
 msgid "Database tablespace"
 msgstr "資料庫 tablespace"
 
-#: templates/installation.php:129
+#: templates/installation.php:131
 msgid "Database host"
 msgstr "資料庫主機"
 
-#: templates/installation.php:134
+#: templates/installation.php:136
 msgid "Finish setup"
 msgstr "完成設定"
 
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
 msgid "web services under your control"
 msgstr "網路服務在您控制之下"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
 msgid "Log out"
 msgstr "登出"
 
@@ -567,14 +572,18 @@ msgstr "請更改您的密碼以再次取得您的帳戶的控制權。"
 msgid "Lost your password?"
 msgstr "忘記密碼？"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "記住"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "登入"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "上一頁"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 5775c873fa0..6f12f19b478 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 13:40+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,46 +23,60 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+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 ""
+
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "沒有檔案被上傳。未知的錯誤。"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "無錯誤，檔案上傳成功"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "上傳的檔案大小超過 php.ini 當中 upload_max_filesize 參數的設定："
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "上傳的檔案大小超過 HTML 表單中 MAX_FILE_SIZE 的限制"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "只有檔案的一部分被上傳"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "無已上傳檔案"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "遺失暫存資料夾"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "寫入硬碟失敗"
 
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "沒有足夠的可用空間"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr "無效的資料夾。"
 
@@ -74,11 +88,15 @@ msgstr "檔案"
 msgid "Unshare"
 msgstr "取消共享"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "刪除"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "重新命名"
 
@@ -183,31 +201,31 @@ msgstr "URL 不能為空白."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "無效的資料夾名稱，'Shared' 的使用被 Owncloud 保留"
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "名稱"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "修改"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 個資料夾"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} 個資料夾"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 個檔案"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} 個檔案"
 
diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po
index 212c2b01ff0..ffbd5fd24ea 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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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,31 +17,45 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "名稱"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 個資料夾"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} 個資料夾"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 個檔案"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} 個檔案"
 
diff --git a/l10n/zh_TW/files_versions.po b/l10n/zh_TW/files_versions.po
index 1d41bf764bc..2855967dae2 100644
--- a/l10n/zh_TW/files_versions.po
+++ b/l10n/zh_TW/files_versions.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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -18,10 +18,45 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
 #: js/versions.js:16
 msgid "History"
 msgstr "歷史"
 
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "檔案版本化中..."
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 96601994d53..b1edf5e5393 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-04 00:05+0100\n"
-"PO-Revision-Date: 2013-02-03 06:00+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,6 +29,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "無法從 App Store 讀取清單"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "認證錯誤"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "群組已存在"
@@ -53,10 +62,6 @@ msgstr "無效的email"
 msgid "Unable to delete group"
 msgstr "群組刪除錯誤"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "認證錯誤"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "使用者刪除錯誤"
@@ -119,7 +124,7 @@ msgstr "錯誤"
 msgid "Updated"
 msgstr "已更新"
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "儲存中..."
 
@@ -196,67 +201,83 @@ msgstr "下載 Android 客戶端"
 msgid "Download iOS Client"
 msgstr "下載 iOS 客戶端"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "密碼"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "你的密碼已更改"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "無法變更你的密碼"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "目前密碼"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "新密碼"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "顯示"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "變更密碼"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "顯示名稱"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "電子郵件"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "你的電子郵件信箱"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "請填入電子郵件信箱以便回復密碼"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "語言"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "幫助翻譯"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "在您的檔案管理員中使用這個地址來連線到 ownCloud"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "版本"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -290,10 +311,6 @@ msgstr "無限制"
 msgid "Other"
 msgstr "其他"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr "顯示名稱"
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "群組 管理員"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index f6b4543db19..89db84884a7 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.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-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+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"
@@ -214,7 +214,7 @@ msgid "Use TLS"
 msgstr "使用TLS"
 
 #: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
 #: templates/settings.php:39
diff --git a/lib/app.php b/lib/app.php
index 3a4e21e8cd1..ca256ed1aaa 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -39,6 +39,15 @@ class OC_App{
 	static private $altLogin = array();
 
 	/**
+	 * @brief clean the appid
+	 * @param $app Appid that needs to be cleaned
+	 * @return string
+	 */
+	public static function cleanAppId($app) {
+		return str_replace(array('\0', '/', '\\', '..'), '', $app);
+	}
+
+	/**
 	 * @brief loads all apps
 	 * @param array $types
 	 * @return bool
@@ -286,6 +295,23 @@ class OC_App{
 	}
 
 	/**
+	 * @brief Get the navigation entries for the $app
+	 * @param string $app app
+	 * @return array of the $data added with addNavigationEntry
+	 */
+	public static function getAppNavigationEntries($app) {
+		if(is_file(self::getAppPath($app).'/appinfo/app.php')) {
+			$save = self::$navigation;
+			self::$navigation = array();
+			require $app.'/appinfo/app.php';
+			$app_entries = self::$navigation;
+			self::$navigation = $save;
+			return $app_entries;
+		}
+		return array();
+	}
+
+	/**
 	 * @brief gets the active Menu entry
 	 * @return string id or empty string
 	 *
diff --git a/lib/archive/tar.php b/lib/archive/tar.php
index 117d88e5f42..e7c81389619 100644
--- a/lib/archive/tar.php
+++ b/lib/archive/tar.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-require_once 'Archive/Tar.php';
+require_once OC::$THIRDPARTYROOT . '/3rdparty/Archive/Tar.php';
 
 class OC_Archive_TAR extends OC_Archive{
 	const PLAIN=0;
diff --git a/lib/base.php b/lib/base.php
index b432f282aaf..c60a97100f4 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -346,7 +346,7 @@ class OC {
 	public static function init() {
 		// register autoloader
 		spl_autoload_register(array('OC', 'autoload'));
-		setlocale(LC_ALL, 'en_US.UTF-8');
+		OC_Util::issetlocaleworking();
 
 		// set some stuff
 		//ob_start();
@@ -468,7 +468,7 @@ class OC {
 		register_shutdown_function(array('OC_Helper', 'cleanTmp'));
 
 		//parse the given parameters
-		self::$REQUESTEDAPP = (isset($_GET['app']) && trim($_GET['app']) != '' && !is_null($_GET['app']) ? str_replace(array('\0', '/', '\\', '..'), '', strip_tags($_GET['app'])) : OC_Config::getValue('defaultapp', 'files'));
+		self::$REQUESTEDAPP = (isset($_GET['app']) && trim($_GET['app']) != '' && !is_null($_GET['app']) ? OC_App::cleanAppId(strip_tags($_GET['app'])) : OC_Config::getValue('defaultapp', 'files'));
 		if (substr_count(self::$REQUESTEDAPP, '?') != 0) {
 			$app = substr(self::$REQUESTEDAPP, 0, strpos(self::$REQUESTEDAPP, '?'));
 			$param = substr($_GET['app'], strpos($_GET['app'], '?') + 1);
@@ -498,7 +498,7 @@ class OC {
 
 		// write error into log if locale can't be set
 		if (OC_Util::issetlocaleworking() == false) {
-			OC_Log::write('core', 'setting locale to en_US.UTF-8 failed. Support is probably not installed on your system', OC_Log::ERROR);
+			OC_Log::write('core', 'setting locale to en_US.UTF-8/en_US.UTF8 failed. Support is probably not installed on your system', OC_Log::ERROR);
 		}
 		if (OC_Config::getValue('installed', false)) {
 			if (OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') {
@@ -548,20 +548,24 @@ class OC {
 			require_once 'core/setup.php';
 			exit();
 		}
+
 		$request = OC_Request::getPathInfo();
 		if(substr($request, -3) !== '.js'){// we need these files during the upgrade
 			self::checkMaintenanceMode();
 			self::checkUpgrade();
 		}
 
-		try {
-			OC::getRouter()->match(OC_Request::getPathInfo());
-			return;
-		} catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
-			//header('HTTP/1.0 404 Not Found');
-		} catch (Symfony\Component\Routing\Exception\MethodNotAllowedException $e) {
-			OC_Response::setStatus(405);
-			return;
+		if (!self::$CLI) {
+			try {
+				OC_App::loadApps();
+				OC::getRouter()->match(OC_Request::getPathInfo());
+				return;
+			} catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
+				//header('HTTP/1.0 404 Not Found');
+			} catch (Symfony\Component\Routing\Exception\MethodNotAllowedException $e) {
+				OC_Response::setStatus(405);
+				return;
+			}
 		}
 
 		$app = OC::$REQUESTEDAPP;
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 8d504af6163..9a5546dce3f 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -138,7 +138,7 @@ class Scanner {
 	 * walk over any folders that are not fully scanned yet and scan them
 	 */
 	public function backgroundScan() {
-		while ($path = $this->cache->getIncomplete()) {
+		while (($path = $this->cache->getIncomplete()) !== false) {
 			$this->scan($path);
 			$this->cache->correctFolderSize($path);
 		}
diff --git a/lib/files/mapper.php b/lib/files/mapper.php
new file mode 100644
index 00000000000..90e4e1ca669
--- /dev/null
+++ b/lib/files/mapper.php
@@ -0,0 +1,216 @@
+<?php
+
+namespace OC\Files;
+
+/**
+ * class Mapper is responsible to translate logical paths to physical paths and reverse
+ */
+class Mapper
+{
+	/**
+	 * @param string $logicPath
+	 * @param bool $create indicates if the generated physical name shall be stored in the database or not
+	 * @return string the physical path
+	 */
+	public function logicToPhysical($logicPath, $create) {
+		$physicalPath = $this->resolveLogicPath($logicPath);
+		if ($physicalPath !== null) {
+			return $physicalPath;
+		}
+
+		return $this->create($logicPath, $create);
+	}
+
+	/**
+	 * @param string $physicalPath
+	 * @return string|null
+	 */
+	public function physicalToLogic($physicalPath) {
+		$logicPath = $this->resolvePhysicalPath($physicalPath);
+		if ($logicPath !== null) {
+			return $logicPath;
+		}
+
+		$this->insert($physicalPath, $physicalPath);
+		return $physicalPath;
+	}
+
+	/**
+	 * @param string $path
+	 * @param bool $isLogicPath indicates if $path is logical or physical
+	 * @param $recursive
+	 */
+	public function removePath($path, $isLogicPath, $recursive) {
+		if ($recursive) {
+			$path=$path.'%';
+		}
+
+		if ($isLogicPath) {
+			$query = \OC_DB::prepare('DELETE FROM `*PREFIX*file_map` WHERE `logic_path` LIKE ?');
+			$query->execute(array($path));
+		} else {
+			$query = \OC_DB::prepare('DELETE FROM `*PREFIX*file_map` WHERE `physic_path` LIKE ?');
+			$query->execute(array($path));
+		}
+	}
+
+	/**
+	 * @param $path1
+	 * @param $path2
+	 * @throws \Exception
+	 */
+	public function copy($path1, $path2)
+	{
+		$path1 = $this->stripLast($path1);
+		$path2 = $this->stripLast($path2);
+		$physicPath1 = $this->logicToPhysical($path1, true);
+		$physicPath2 = $this->logicToPhysical($path2, true);
+
+		$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*file_map` WHERE `logic_path` LIKE ?');
+		$result = $query->execute(array($path1.'%'));
+		$updateQuery = \OC_DB::prepare('UPDATE `*PREFIX*file_map`'
+			.' SET `logic_path` = ?'
+			.' AND `physic_path` = ?'
+			.' WHERE `logic_path` = ?');
+		while( $row = $result->fetchRow()) {
+			$currentLogic = $row['logic_path'];
+			$currentPhysic = $row['physic_path'];
+			$newLogic = $path2.$this->stripRootFolder($currentLogic, $path1);
+			$newPhysic = $physicPath2.$this->stripRootFolder($currentPhysic, $physicPath1);
+			if ($path1 !== $currentLogic) {
+				try {
+					$updateQuery->execute(array($newLogic, $newPhysic, $currentLogic));
+				} catch (\Exception $e) {
+					error_log('Mapper::Copy failed '.$currentLogic.' -> '.$newLogic.'\n'.$e);
+					throw $e;
+				}
+			}
+		}
+	}
+
+	/**
+	 * @param $path
+	 * @param $root
+	 * @return bool|string
+	 */
+	public function stripRootFolder($path, $root) {
+		if (strpos($path, $root) !== 0) {
+			// throw exception ???
+			return false;
+		}
+		if (strlen($path) > strlen($root)) {
+			return substr($path, strlen($root));
+		}
+
+		return '';
+	}
+
+	private function stripLast($path) {
+		if (substr($path, -1) == '/') {
+			$path = substr_replace($path ,'',-1);
+		}
+		return $path;
+	}
+
+	private function resolveLogicPath($logicPath) {
+		$logicPath = $this->stripLast($logicPath);
+		$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*file_map` WHERE `logic_path` = ?');
+		$result = $query->execute(array($logicPath));
+		$result = $result->fetchRow();
+
+		return $result['physic_path'];
+	}
+
+	private function resolvePhysicalPath($physicalPath) {
+		$physicalPath = $this->stripLast($physicalPath);
+		$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*file_map` WHERE `physic_path` = ?');
+		$result = $query->execute(array($physicalPath));
+		$result = $result->fetchRow();
+
+		return $result['logic_path'];
+	}
+
+	private function create($logicPath, $store) {
+		$logicPath = $this->stripLast($logicPath);
+		$index = 0;
+
+		// create the slugified path
+		$physicalPath = $this->slugifyPath($logicPath);
+
+		// detect duplicates
+		while ($this->resolvePhysicalPath($physicalPath) !== null) {
+			$physicalPath = $this->slugifyPath($physicalPath, $index++);
+		}
+
+		// insert the new path mapping if requested
+		if ($store) {
+			$this->insert($logicPath, $physicalPath);
+		}
+
+		return $physicalPath;
+	}
+
+	private function insert($logicPath, $physicalPath) {
+		$query = \OC_DB::prepare('INSERT INTO `*PREFIX*file_map`(`logic_path`,`physic_path`) VALUES(?,?)');
+		$query->execute(array($logicPath, $physicalPath));
+	}
+
+	private function slugifyPath($path, $index=null) {
+		$pathElements = explode('/', $path);
+		$sluggedElements = array();
+
+		// skip slugging the drive letter on windows - TODO: test if local path
+		if (strpos(strtolower(php_uname('s')), 'win') !== false) {
+			$sluggedElements[]= $pathElements[0];
+			array_shift($pathElements);
+		}
+		foreach ($pathElements as $pathElement) {
+			// TODO: remove file ext before slugify on last element
+			$sluggedElements[] = self::slugify($pathElement);
+		}
+
+		//
+		// TODO: add the index before the file extension
+		//
+		if ($index !== null) {
+			$last= end($sluggedElements);
+			array_pop($sluggedElements);
+			array_push($sluggedElements, $last.'-'.$index);
+		}
+		return implode(DIRECTORY_SEPARATOR, $sluggedElements);
+	}
+
+	/**
+	 * Modifies a string to remove all non ASCII characters and spaces.
+	 *
+	 * @param string $text
+	 * @return string
+	 */
+	private function slugify($text)
+	{
+		// replace non letter or digits by -
+		$text = preg_replace('~[^\\pL\d]+~u', '-', $text);
+
+		// trim
+		$text = trim($text, '-');
+
+		// transliterate
+		if (function_exists('iconv')) {
+			$text = iconv('utf-8', 'us-ascii//TRANSLIT', $text);
+		}
+
+		// lowercase
+		$text = strtolower($text);
+
+		// remove unwanted characters
+		$text = preg_replace('~[^-\w]+~', '', $text);
+
+		if (empty($text))
+		{
+			// TODO: we better generate a guid in this case
+			return 'n-a';
+		}
+
+		return $text;
+	}
+}
diff --git a/lib/files/storage/local.php b/lib/files/storage/local.php
index a5db4ba9194..d387a898320 100644
--- a/lib/files/storage/local.php
+++ b/lib/files/storage/local.php
@@ -8,6 +8,10 @@
 
 namespace OC\Files\Storage;
 
+if (\OC_Util::runningOnWindows()) {
+	require_once 'mappedlocal.php';
+} else {
+
 /**
  * for local filestore, we only have to map the paths
  */
@@ -245,3 +249,4 @@ class Local extends \OC\Files\Storage\Common{
 		return $this->filemtime($path)>$time;
 	}
 }
+}
diff --git a/lib/files/storage/mappedlocal.php b/lib/files/storage/mappedlocal.php
new file mode 100644
index 00000000000..80dd79bc41f
--- /dev/null
+++ b/lib/files/storage/mappedlocal.php
@@ -0,0 +1,335 @@
+<?php
+/**
+ * Copyright (c) 2012 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\Storage;
+
+/**
+ * for local filestore, we only have to map the paths
+ */
+class Local extends \OC\Files\Storage\Common{
+	protected $datadir;
+	private $mapper;
+
+	public function __construct($arguments) {
+		$this->datadir=$arguments['datadir'];
+		if(substr($this->datadir, -1)!=='/') {
+			$this->datadir.='/';
+		}
+
+		$this->mapper= new \OC\Files\Mapper();
+	}
+	public function __destruct() {
+		if (defined('PHPUNIT_RUN')) {
+			$this->mapper->removePath($this->datadir, true, true);
+		}
+	}
+	public function getId(){
+		return 'local::'.$this->datadir;
+	}
+	public function mkdir($path) {
+		return @mkdir($this->buildPath($path));
+	}
+	public function rmdir($path) {
+		if ($result = @rmdir($this->buildPath($path))) {
+			$this->cleanMapper($path);
+		}
+		return $result;
+	}
+	public function opendir($path) {
+		$files = array('.', '..');
+		$physicalPath= $this->buildPath($path);
+
+		$logicalPath = $this->mapper->physicalToLogic($physicalPath);
+		$dh = opendir($physicalPath);
+		while ($file = readdir($dh)) {
+			if ($file === '.' or $file === '..') {
+				continue;
+			}
+
+			$logicalFilePath = $this->mapper->physicalToLogic($physicalPath.DIRECTORY_SEPARATOR.$file);
+
+			$file= $this->mapper->stripRootFolder($logicalFilePath, $logicalPath);
+			$file = $this->stripLeading($file);
+			$files[]= $file;
+		}
+
+		\OC\Files\Stream\Dir::register('local-win32'.$path, $files);
+		return opendir('fakedir://local-win32'.$path);
+	}
+	public function is_dir($path) {
+		if(substr($path,-1)=='/') {
+			$path=substr($path, 0, -1);
+		}
+		return is_dir($this->buildPath($path));
+	}
+	public function is_file($path) {
+		return is_file($this->buildPath($path));
+	}
+	public function stat($path) {
+		$fullPath = $this->buildPath($path);
+		$statResult = stat($fullPath);
+
+		if ($statResult['size'] < 0) {
+			$size = self::getFileSizeFromOS($fullPath);
+			$statResult['size'] = $size;
+			$statResult[7] = $size;
+		}
+		return $statResult;
+	}
+	public function filetype($path) {
+		$filetype=filetype($this->buildPath($path));
+		if($filetype=='link') {
+			$filetype=filetype(realpath($this->buildPath($path)));
+		}
+		return $filetype;
+	}
+	public function filesize($path) {
+		if($this->is_dir($path)) {
+			return 0;
+		}else{
+			$fullPath = $this->buildPath($path);
+			$fileSize = filesize($fullPath);
+			if ($fileSize < 0) {
+				return self::getFileSizeFromOS($fullPath);
+			}
+
+			return $fileSize;
+		}
+	}
+	public function isReadable($path) {
+		return is_readable($this->buildPath($path));
+	}
+	public function isUpdatable($path) {
+		return is_writable($this->buildPath($path));
+	}
+	public function file_exists($path) {
+		return file_exists($this->buildPath($path));
+	}
+	public function filemtime($path) {
+		return filemtime($this->buildPath($path));
+	}
+	public function touch($path, $mtime=null) {
+		// sets the modification time of the file to the given value.
+		// If mtime is nil the current time is set.
+		// note that the access time of the file always changes to the current time.
+		if(!is_null($mtime)) {
+			$result=touch( $this->buildPath($path), $mtime );
+		}else{
+			$result=touch( $this->buildPath($path));
+		}
+		if( $result ) {
+			clearstatcache( true, $this->buildPath($path) );
+		}
+
+		return $result;
+	}
+	public function file_get_contents($path) {
+		return file_get_contents($this->buildPath($path));
+	}
+	public function file_put_contents($path, $data) {//trigger_error("$path = ".var_export($path, 1));
+		return file_put_contents($this->buildPath($path), $data);
+	}
+	public function unlink($path) {
+		return $this->delTree($path);
+	}
+	public function rename($path1, $path2) {
+		if (!$this->isUpdatable($path1)) {
+			\OC_Log::write('core','unable to rename, file is not writable : '.$path1,\OC_Log::ERROR);
+			return false;
+		}
+		if(! $this->file_exists($path1)) {
+			\OC_Log::write('core','unable to rename, file does not exists : '.$path1,\OC_Log::ERROR);
+			return false;
+		}
+
+		$physicPath1 = $this->buildPath($path1);
+		$physicPath2 = $this->buildPath($path2);
+		if($return=rename($physicPath1, $physicPath2)) {
+			// mapper needs to create copies or all children
+			$this->copyMapping($path1, $path2);
+			$this->cleanMapper($physicPath1, false, true);
+		}
+		return $return;
+	}
+	public function copy($path1, $path2) {
+		if($this->is_dir($path2)) {
+			if(!$this->file_exists($path2)) {
+				$this->mkdir($path2);
+			}
+			$source=substr($path1, strrpos($path1, '/')+1);
+			$path2.=$source;
+		}
+		if($return=copy($this->buildPath($path1), $this->buildPath($path2))) {
+			// mapper needs to create copies or all children
+			$this->copyMapping($path1, $path2);
+		}
+		return $return;
+	}
+	public function fopen($path, $mode) {
+		if($return=fopen($this->buildPath($path), $mode)) {
+			switch($mode) {
+				case 'r':
+					break;
+				case 'r+':
+				case 'w+':
+				case 'x+':
+				case 'a+':
+					break;
+				case 'w':
+				case 'x':
+				case 'a':
+					break;
+			}
+		}
+		return $return;
+	}
+
+	public function getMimeType($path) {
+		if($this->isReadable($path)) {
+			return \OC_Helper::getMimeType($this->buildPath($path));
+		}else{
+			return false;
+		}
+	}
+
+	private function delTree($dir, $isLogicPath=true) {
+		$dirRelative=$dir;
+		if ($isLogicPath) {
+			$dir=$this->buildPath($dir);
+		}
+		if (!file_exists($dir)) {
+			return true;
+		}
+		if (!is_dir($dir) || is_link($dir)) {
+			if($return=unlink($dir)) {
+				$this->cleanMapper($dir, false);
+				return $return;
+			}
+		}
+		foreach (scandir($dir) as $item) {
+			if ($item == '.' || $item == '..') {
+				continue;
+			}
+			if(is_file($dir.'/'.$item)) {
+				if(unlink($dir.'/'.$item)) {
+					$this->cleanMapper($dir.'/'.$item, false);
+				}
+			}elseif(is_dir($dir.'/'.$item)) {
+				if (!$this->delTree($dir. "/" . $item, false)) {
+					return false;
+				};
+			}
+		}
+		if($return=rmdir($dir)) {
+			$this->cleanMapper($dir, false);
+		}
+		return $return;
+	}
+
+	private static function getFileSizeFromOS($fullPath) {
+		$name = strtolower(php_uname('s'));
+		// Windows OS: we use COM to access the filesystem
+		if (strpos($name, 'win') !== false) {
+			if (class_exists('COM')) {
+				$fsobj = new \COM("Scripting.FileSystemObject");
+				$f = $fsobj->GetFile($fullPath);
+				return $f->Size;
+			}
+		} else if (strpos($name, 'bsd') !== false) {
+			if (\OC_Helper::is_function_enabled('exec')) {
+				return (float)exec('stat -f %z ' . escapeshellarg($fullPath));
+			}
+		} else if (strpos($name, 'linux') !== false) {
+			if (\OC_Helper::is_function_enabled('exec')) {
+				return (float)exec('stat -c %s ' . escapeshellarg($fullPath));
+			}
+		} else {
+			\OC_Log::write('core', 'Unable to determine file size of "'.$fullPath.'". Unknown OS: '.$name, \OC_Log::ERROR);
+		}
+
+		return 0;
+	}
+
+	public function hash($path, $type, $raw=false) {
+		return hash_file($type, $this->buildPath($path), $raw);
+	}
+
+	public function free_space($path) {
+		return @disk_free_space($this->buildPath($path));
+	}
+
+	public function search($query) {
+		return $this->searchInDir($query);
+	}
+	public function getLocalFile($path) {
+		return $this->buildPath($path);
+	}
+	public function getLocalFolder($path) {
+		return $this->buildPath($path);
+	}
+
+	protected function searchInDir($query, $dir='', $isLogicPath=true) {
+		$files=array();
+		$physicalDir = $this->buildPath($dir);
+		foreach (scandir($physicalDir) as $item) {
+			if ($item == '.' || $item == '..')
+				continue;
+			$physicalItem = $this->mapper->physicalToLogic($physicalDir.DIRECTORY_SEPARATOR.$item);
+			$item = substr($physicalItem, strlen($physicalDir)+1);
+
+			if(strstr(strtolower($item), strtolower($query)) !== false) {
+				$files[]=$dir.'/'.$item;
+			}
+			if(is_dir($physicalItem)) {
+				$files=array_merge($files, $this->searchInDir($query, $physicalItem, false));
+			}
+		}
+		return $files;
+	}
+
+	/**
+	 * check if a file or folder has been updated since $time
+	 * @param string $path
+	 * @param int $time
+	 * @return bool
+	 */
+	public function hasUpdated($path, $time) {
+		return $this->filemtime($path)>$time;
+	}
+
+	private function buildPath($path, $create=true) {
+		$path = $this->stripLeading($path);
+		$fullPath = $this->datadir.$path;
+		return $this->mapper->logicToPhysical($fullPath, $create);
+	}
+
+	private function cleanMapper($path, $isLogicPath=true, $recursive=true) {
+		$fullPath = $path;
+		if ($isLogicPath) {
+			$fullPath = $this->datadir.$path;
+		}
+		$this->mapper->removePath($fullPath, $isLogicPath, $recursive);
+	}
+
+	private function copyMapping($path1, $path2) {
+		$path1 = $this->stripLeading($path1);
+		$path2 = $this->stripLeading($path2);
+
+		$fullPath1 = $this->datadir.$path1;
+		$fullPath2 = $this->datadir.$path2;
+
+		$this->mapper->copy($fullPath1, $fullPath2);
+	}
+
+	private function stripLeading($path) {
+		if(strpos($path, '/') === 0) {
+			$path = substr($path, 1);
+		}
+
+		return $path;
+	}
+}
diff --git a/lib/files/view.php b/lib/files/view.php
index dfcb770328b..1a234228eab 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -509,11 +509,7 @@ class View {
 		if (Filesystem::isValidPath($path)) {
 			$source = $this->fopen($path, 'r');
 			if ($source) {
-				$extension = '';
-				$extOffset = strpos($path, '.');
-				if ($extOffset !== false) {
-					$extension = substr($path, strrpos($path, '.'));
-				}
+				$extension = pathinfo($path, PATHINFO_EXTENSION);
 				$tmpFile = \OC_Helper::tmpFile($extension);
 				file_put_contents($tmpFile, $source);
 				return $tmpFile;
diff --git a/lib/helper.php b/lib/helper.php
index 0e549d006a1..a0fbdd10394 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -394,13 +394,12 @@ class OC_Helper {
 			// it looks like we have a 'file' command,
 			// lets see if it does have mime support
 			$path=escapeshellarg($path);
-			$fp = popen("file -i -b $path 2>/dev/null", "r");
+			$fp = popen("file -b --mime-type $path 2>/dev/null", "r");
 			$reply = fgets($fp);
 			pclose($fp);
 
-			// we have smth like 'text/x-c++; charset=us-ascii\n'
-			// and need to eliminate everything starting with semicolon including trailing LF
-			$mimeType = preg_replace('/;.*/ms', '', trim($reply));
+			//trim the newline
+			$mimeType = trim($reply);
 
 		}
 		return $mimeType;
diff --git a/lib/hook.php b/lib/hook.php
index 4da331bb5d8..e30aefb5e18 100644
--- a/lib/hook.php
+++ b/lib/hook.php
@@ -20,19 +20,22 @@ class OC_Hook{
 	 * TODO: write example
 	 */
 	static public function connect( $signalclass, $signalname, $slotclass, $slotname ) {
-		// Create the data structure
+		// If we're trying to connect to an emitting class that isn't 
+		// yet registered, register it
 		if( !array_key_exists( $signalclass, self::$registered )) {
 			self::$registered[$signalclass] = array();
 		}
-		if( !array_key_exists( $signalname, self::$registered[$signalclass] )) {
+		// If we're trying to connect to an emitting method that isn't 
+		// yet registered, register it with the emitting class
+		if( !array_key_exists( $signalname, self::$registered[$signalclass] )) {			
 			self::$registered[$signalclass][$signalname] = array();
 		}
-
-		// register hook
+		
+		// Connect the hook handler to the requested emitter
 		self::$registered[$signalclass][$signalname][] = array(
 		  "class" => $slotclass,
 		  "name" => $slotname );
-
+		
 		// No chance for failure ;-)
 		return true;
 	}
@@ -49,14 +52,19 @@ class OC_Hook{
 	 * TODO: write example
 	 */
 	static public function emit( $signalclass, $signalname, $params = array()) {
-		// Return false if there are no slots
+		
+		// Return false if no hook handlers are listening to this
+		// emitting class
 		if( !array_key_exists( $signalclass, self::$registered )) {
 			return false;
 		}
+		
+		// Return false if no hook handlers are listening to this
+		// emitting method
 		if( !array_key_exists( $signalname, self::$registered[$signalclass] )) {
 			return false;
 		}
-
+		
 		// Call all slots
 		foreach( self::$registered[$signalclass][$signalname] as $i ) {
 			try {
diff --git a/lib/l10n.php b/lib/l10n.php
index ee879009265..e272bcd79f3 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -97,7 +97,7 @@ class OC_L10N{
 		if ($this->app === true) {
 			return;
 		}
-		$app = $this->app;
+		$app = OC_App::cleanAppId($this->app);
 		$lang = $this->lang;
 		$this->app = true;
 		// Find the right language
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index 3ed55f8e9dc..5ef2cca3be3 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "Файлы должны быть загружены по одному.",
 "Back to Files" => "Назад к файлам",
 "Selected files too large to generate zip file." => "Выбранные файлы слишком велики, чтобы создать zip файл.",
+"couldn't be determined" => "Невозможно установить",
 "Application is not enabled" => "Приложение не разрешено",
 "Authentication error" => "Ошибка аутентификации",
 "Token expired. Please reload page." => "Токен просрочен. Перезагрузите страницу.",
diff --git a/lib/mimetypes.list.php b/lib/mimetypes.list.php
index fc87d011ecd..86ce9c6c237 100644
--- a/lib/mimetypes.list.php
+++ b/lib/mimetypes.list.php
@@ -97,4 +97,6 @@ return array(
 	'ai' => 'application/illustrator',
 	'epub' => 'application/epub+zip',
 	'mobi' => 'application/x-mobipocket-ebook',
+	'exe' => 'application',
+	'msi' => 'application'
 );
diff --git a/lib/public/contacts.php b/lib/public/contacts.php
index 44d82c37908..88d812e735a 100644
--- a/lib/public/contacts.php
+++ b/lib/public/contacts.php
@@ -149,14 +149,14 @@ namespace OCP {
 		/**
 		 * @param \OCP\IAddressBook $address_book
 		 */
-		public static function registerAddressBook($address_book) {
+		public static function registerAddressBook(\OCP\IAddressBook $address_book) {
 			self::$address_books[$address_book->getKey()] = $address_book;
 		}
 
 		/**
 		 * @param \OCP\IAddressBook $address_book
 		 */
-		public static function unregisterAddressBook($address_book) {
+		public static function unregisterAddressBook(\OCP\IAddressBook $address_book) {
 			unset(self::$address_books[$address_book->getKey()]);
 		}
 
diff --git a/lib/public/share.php b/lib/public/share.php
index d46bee26dd4..af2a538e252 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -704,7 +704,7 @@ class Share {
 						$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `uid_owner`, '
 								 .'`share_type`, `share_with`, `file_source`, `path`, `file_target`, '
 								 .'`permissions`, `expiration`, `storage`, `*PREFIX*filecache`.`parent` as `file_parent`, '
-								 .'`name`  `mtime`, `mimetype`, `mimepart`, `size`, `encrypted`, `etag`';
+								 .'`name`, `mtime`, `mimetype`, `mimepart`, `size`, `encrypted`, `etag`';
 					} else {
 						$select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`, `file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`, `token`';
 					}
diff --git a/lib/public/util.php b/lib/public/util.php
index a78a52f326e..5f6ede4460e 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -59,9 +59,9 @@ class Util {
 	 * @param string $fromname
 	 * @param bool $html
 	 */
-	public static function sendMail( $toaddress, $toname, $subject, $mailtext, $fromaddress, $fromname, $html=0, $altbody='', $ccaddress='', $ccname='', $bcc='') {
+	public static function sendMail( $toaddress, $toname, $subject, $mailtext, $fromaddress, $fromname, $html = 0, $altbody = '', $ccaddress = '', $ccname = '', $bcc = '') {
 		// call the internal mail class
-		\OC_MAIL::send($toaddress, $toname, $subject, $mailtext, $fromaddress, $fromname, $html = 0, $altbody = '', $ccaddress = '', $ccname = '', $bcc = '');
+		\OC_MAIL::send($toaddress, $toname, $subject, $mailtext, $fromaddress, $fromname, $html, $altbody, $ccaddress, $ccname, $bcc);
 	}
 
 	/**
@@ -148,6 +148,20 @@ class Util {
 	}
 
 	/**
+	 * @brief Creates an url using a defined route
+	 * @param $route
+	 * @param array $parameters
+	 * @return
+	 * @internal param array $args with param=>value, will be appended to the returned url
+	 * @returns the url
+	 *
+	 * Returns a url to the given app and file.
+	 */
+	public static function linkToRoute( $route, $parameters = array() ) {
+		return \OC_Helper::linkToRoute($route, $parameters);
+	}
+
+	/**
 	* @brief Creates an url
 	* @param string $app app
 	* @param string $file file
diff --git a/lib/router.php b/lib/router.php
index 746b68c2c0c..dbaca9e0d5d 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -23,7 +23,11 @@ class OC_Router {
 
 	public function __construct() {
 		$baseUrl = OC_Helper::linkTo('', 'index.php');
-		$method = $_SERVER['REQUEST_METHOD'];
+		if ( !OC::$CLI) {
+			$method = $_SERVER['REQUEST_METHOD'];
+		}else{
+			$method = 'GET';
+		}
 		$host = OC_Request::serverHost();
 		$schema = OC_Request::serverProtocol();
 		$this->context = new RequestContext($baseUrl, $method, $host, $schema);
diff --git a/lib/setup.php b/lib/setup.php
index 4dd190b99fb..f342142c957 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -610,4 +610,24 @@ class OC_Setup {
 		file_put_contents(OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data').'/.htaccess', $content);
 		file_put_contents(OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data').'/index.html', '');
 	}
+
+	/**
+	 * @brief Post installation checks
+	 */
+	public static function postSetupCheck($params) {
+		// setup was successful -> webdav testing now
+		if (OC_Util::isWebDAVWorking()) {
+			header("Location: ".OC::$WEBROOT.'/');
+		} else {
+			$l=OC_L10N::get('lib');
+
+			$error = $l->t('Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken.');
+			$hint = $l->t('Please double check the <a href=\'%s\'>installation guides</a>.', 'http://doc.owncloud.org/server/5.0/admin_manual/installation.html');
+
+			$tmpl = new OC_Template('', 'error', 'guest');
+			$tmpl->assign('errors', array(1 => array('error' => $error, 'hint' => $hint)), false);
+			$tmpl->printPage();
+			exit();
+		}
+	}
 }
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 37ece91047f..345f540af04 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -19,6 +19,7 @@ class OC_TemplateLayout extends OC_Template {
 			}
 
 			// Add navigation entry
+			$this->assign( 'application', '', false );
 			$navigation = OC_App::getNavigation();
 			$this->assign( 'navigation', $navigation, false);
 			$this->assign( 'settingsnavigation', OC_App::getSettingsNavigation(), false);
@@ -28,6 +29,8 @@ class OC_TemplateLayout extends OC_Template {
 					break;
 				}
 			}
+			$user_displayname = OC_User::getDisplayName();
+			$this->assign( 'user_displayname', $user_displayname );
 		} else if ($renderas == 'guest') {
 			parent::__construct('core', 'layout.guest');
 		} else {
@@ -36,6 +39,9 @@ class OC_TemplateLayout extends OC_Template {
 		// Add the js files
 		$jsfiles = self::findJavascriptFiles(OC_Util::$scripts);
 		$this->assign('jsfiles', array(), false);
+		if (OC_Config::getValue('installed', false)) {
+			$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config'));
+		}
 		if (!empty(OC_Util::$core_scripts)) {
 			$this->append( 'jsfiles', OC_Helper::linkToRemoteBase('core.js', false));
 		}
diff --git a/lib/util.php b/lib/util.php
index 5983c34e761..a5fe4cb175a 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -516,6 +516,40 @@ class OC_Util {
 		}
 	}
 
+	/**
+	 * we test if webDAV is working properly
+	 *
+	 * The basic assumption is that if the server returns 401/Not Authenticated for an unauthenticated PROPFIND
+	 * the web server it self is setup properly.
+	 *
+	 * Why not an authenticated PROFIND and other verbs?
+	 *  - We don't have the password available
+	 *  - We have no idea about other auth methods implemented (e.g. OAuth with Bearer header)
+	 *
+	 */
+	public static function isWebDAVWorking() {
+        if (!function_exists('curl_init')) {
+            return;
+        }
+
+		$settings = array(
+			'baseUri' => OC_Helper::linkToRemote('webdav'),
+		);
+
+		$client = new \Sabre_DAV_Client($settings);
+
+		$return = true;
+		try {
+			// test PROPFIND
+			$client->propfind('', array('{DAV:}resourcetype'));
+		} catch(\Sabre_DAV_Exception_NotAuthenticated $e) {
+			$return = true;
+		} catch(\Exception $e) {
+			$return = false;
+		}
+
+		return $return;
+	}
 
 	/**
 	 * Check if the setlocal call doesn't work. This can happen if the right local packages are not available on the server.
@@ -526,12 +560,19 @@ class OC_Util {
 			return true;
 		}
 
-		$result=setlocale(LC_ALL, 'en_US.UTF-8');
-		if($result==false) {
-			return(false);
-		}else{
-			return(true);
-		}
+		$result = setlocale(LC_ALL, 'en_US.UTF-8', 'en_US.UTF8');
+		if($result == false) {
+			return false;
+        }
+        return true;
+	}
+
+	/**
+	 * Check if the PHP module fileinfo is loaded.
+	 * @return bool
+	 */
+	public static function fileInfoLoaded() {
+		return function_exists('finfo_open');
 	}
 
 	/**
@@ -646,6 +687,9 @@ class OC_Util {
 			curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
 			curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 10);
 			curl_setopt($curl, CURLOPT_URL, $url);
+			curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
+			curl_setopt($curl, CURLOPT_MAXREDIRS, 10);
+
 			curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler");
 			if(OC_Config::getValue('proxy','')<>'') {
 				curl_setopt($curl, CURLOPT_PROXY, OC_Config::getValue('proxy'));
diff --git a/settings/admin.php b/settings/admin.php
index 4d9685ab920..c7848803095 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -31,6 +31,8 @@ $tmpl->assign('entriesremain', $entriesremain);
 $tmpl->assign('htaccessworking', $htaccessworking);
 $tmpl->assign('internetconnectionworking', OC_Util::isinternetconnectionworking());
 $tmpl->assign('islocaleworking', OC_Util::issetlocaleworking());
+$tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking());
+$tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded());
 $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
 $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes'));
 
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index 8d45e62e4d8..ceb4bbeecb0 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -4,6 +4,9 @@
 OCP\JSON::callCheck();
 OC_JSON::checkLoggedIn();
 
+// Manually load apps to ensure hooks work correctly (workaround for issue 1503)
+OC_APP::loadApps();
+
 $username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
 $password = $_POST["password"];
 $oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:'';
@@ -15,14 +18,8 @@ if(OC_User::isAdminUser(OC_User::getUser())) {
 if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
 	$userstatus = 'subadmin';
 }
-if(OC_User::getUser() === $username) {
-	if (OC_User::checkPassword($username, $oldPassword)) {
-		$userstatus = 'user';
-	}  else {
-		if (!OC_Util::isUserVerified()) {
-			$userstatus = null;
-		}
-	}
+if(OC_User::getUser() === $username && OC_User::checkPassword($username, $oldPassword)) {
+	$userstatus = 'user';
 }
 
 if(is_null($userstatus)) {
diff --git a/settings/ajax/disableapp.php b/settings/ajax/disableapp.php
index e89de928eac..466a719157d 100644
--- a/settings/ajax/disableapp.php
+++ b/settings/ajax/disableapp.php
@@ -2,6 +2,6 @@
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 
-OC_App::disable($_POST['appid']);
+OC_App::disable(OC_App::cleanAppId($_POST['appid']));
 
 OC_JSON::success();
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index 18202dc39e9..ab84aee5166 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -3,7 +3,7 @@
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 
-$appid = OC_App::enable($_POST['appid']);
+$appid = OC_App::enable(OC_App::cleanAppId($_POST['appid']));
 if($appid !== false) {
 	OC_JSON::success(array('data' => array('appid' => $appid)));
 } else {
diff --git a/settings/ajax/navigationdetect.php b/settings/ajax/navigationdetect.php
index 93acb50dc20..7f961eb9bc5 100644
--- a/settings/ajax/navigationdetect.php
+++ b/settings/ajax/navigationdetect.php
@@ -4,11 +4,9 @@ OC_Util::checkAdminUser();
 OCP\JSON::callCheck();
 
 $app = $_GET['app'];
+$app = OC_App::cleanAppId($app);
 
-//load the one app and see what it adds to the navigation
-OC_App::loadApp($app);
-
-$navigation = OC_App::getNavigation();
+$navigation = OC_App::getAppNavigationEntries($app);
 
 $navIds = array();
 foreach ($navigation as $nav) {
diff --git a/settings/ajax/updateapp.php b/settings/ajax/updateapp.php
index 77c0bbc3e36..9367a3b5a3b 100644
--- a/settings/ajax/updateapp.php
+++ b/settings/ajax/updateapp.php
@@ -4,6 +4,7 @@ OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 
 $appid = $_POST['appid'];
+$appid = OC_App::cleanAppId($appid);
 
 $result = OC_Installer::updateApp($appid);
 if($result !== false) {
diff --git a/settings/js/apps-custom.php b/settings/js/apps-custom.php
index 9ec2a758ee3..d827dfc7058 100644
--- a/settings/js/apps-custom.php
+++ b/settings/js/apps-custom.php
@@ -23,4 +23,4 @@ foreach($combinedApps as $app) {
 	echo("\n");
 }
 
-echo ("var appid =\"".$_GET['appid']."\";");
\ No newline at end of file
+echo ("var appid =".json_encode($_GET['appid']).";");
\ No newline at end of file
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index 402d91c48fe..499c237eb7b 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "فشل تحميل القائمة من الآب ستور",
+"Authentication error" => "لم يتم التأكد من الشخصية بنجاح",
 "Group already exists" => "المجموعة موجودة مسبقاً",
 "Unable to add group" => "فشل إضافة المجموعة",
 "Could not enable app. " => "فشل عملية تفعيل التطبيق",
 "Email saved" => "تم حفظ البريد الإلكتروني",
 "Invalid email" => "البريد الإلكتروني غير صالح",
 "Unable to delete group" => "فشل إزالة المجموعة",
-"Authentication error" => "لم يتم التأكد من الشخصية بنجاح",
 "Unable to delete user" => "فشل إزالة المستخدم",
 "Language changed" => "تم تغيير اللغة",
 "Invalid request" => "طلبك غير مفهوم",
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index 60ddcfdde6d..fc90036536a 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "অ্যাপস্টোর থেকে তালিকা লোড করতে সক্ষম নয়",
+"Authentication error" => "অনুমোদন ঘটিত সমস্যা",
 "Group already exists" => "গোষ্ঠীটি পূর্ব থেকেই বিদ্যমান",
 "Unable to add group" => "গোষ্ঠী যোগ করা সম্ভব হলো না",
 "Could not enable app. " => "অ্যপটি সক্রিয় করতে সক্ষম নয়।",
 "Email saved" => "ই-মেইল সংরক্ষন করা হয়েছে",
 "Invalid email" => "ই-মেইলটি সঠিক নয়",
 "Unable to delete group" => "গোষ্ঠী মুছে ফেলা সম্ভব হলো না ",
-"Authentication error" => "অনুমোদন ঘটিত সমস্যা",
 "Unable to delete user" => "ব্যবহারকারী মুছে ফেলা সম্ভব হলো না ",
 "Language changed" => "ভাষা পরিবর্তন করা হয়েছে",
 "Invalid request" => "অনুরোধটি যথাযথ নয়",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 40b19c3b1c3..301ead2802d 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -1,12 +1,13 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "No s'ha pogut carregar la llista des de l'App Store",
+"Authentication error" => "Error d'autenticació",
+"Unable to change display name" => "No s'ha pogut canviar el nom a mostrar",
 "Group already exists" => "El grup ja existeix",
 "Unable to add group" => "No es pot afegir el grup",
 "Could not enable app. " => "No s'ha pogut activar l'apliació",
 "Email saved" => "S'ha desat el correu electrònic",
 "Invalid email" => "El correu electrònic no és vàlid",
 "Unable to delete group" => "No es pot eliminar el grup",
-"Authentication error" => "Error d'autenticació",
 "Unable to delete user" => "No es pot eliminar l'usuari",
 "Language changed" => "S'ha canviat l'idioma",
 "Invalid request" => "Sol.licitud no vàlida",
@@ -48,6 +49,10 @@
 "New password" => "Contrasenya nova",
 "show" => "mostra",
 "Change password" => "Canvia la contrasenya",
+"Display Name" => "Nom a mostrar",
+"Your display name was changed" => "El vostre nom a mostrar ha canviat",
+"Unable to change your display name" => "No s'ha pogut canviar el vostre nom a mostrar",
+"Change display name" => "Canvia el nom a mostrar",
 "Email" => "Correu electrònic",
 "Your email address" => "Correu electrònic",
 "Fill in an email address to enable password recovery" => "Ompliu el correu electrònic per activar la recuperació de contrasenya",
@@ -63,7 +68,6 @@
 "Default Storage" => "Emmagatzemament per defecte",
 "Unlimited" => "Il·limitat",
 "Other" => "Un altre",
-"Display Name" => "Nom a mostrar",
 "Group Admin" => "Grup Admin",
 "Storage" => "Emmagatzemament",
 "change display name" => "canvia el nom a mostrar",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index f1fd0b0b139..30f44dfefc6 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,12 +1,13 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nelze načíst seznam z App Store",
+"Authentication error" => "Chyba ověření",
+"Unable to change display name" => "Nelze změnit zobrazované jméno",
 "Group already exists" => "Skupina již existuje",
 "Unable to add group" => "Nelze přidat skupinu",
 "Could not enable app. " => "Nelze povolit aplikaci.",
 "Email saved" => "E-mail uložen",
 "Invalid email" => "Neplatný e-mail",
 "Unable to delete group" => "Nelze smazat skupinu",
-"Authentication error" => "Chyba ověření",
 "Unable to delete user" => "Nelze smazat uživatele",
 "Language changed" => "Jazyk byl změněn",
 "Invalid request" => "Neplatný požadavek",
@@ -48,6 +49,10 @@
 "New password" => "Nové heslo",
 "show" => "zobrazit",
 "Change password" => "Změnit heslo",
+"Display Name" => "Zobrazované jméno",
+"Your display name was changed" => "Vaše zobrazované jméno bylo změněno",
+"Unable to change your display name" => "Nelze změnit vaše zobrazované jméno",
+"Change display name" => "Změnit zobrazované jméno",
 "Email" => "E-mail",
 "Your email address" => "Vaše e-mailová adresa",
 "Fill in an email address to enable password recovery" => "Pro povolení změny hesla vyplňte adresu e-mailu",
@@ -63,7 +68,6 @@
 "Default Storage" => "Výchozí úložiště",
 "Unlimited" => "Neomezeně",
 "Other" => "Jiná",
-"Display Name" => "Zobrazované jméno",
 "Group Admin" => "Správa skupiny",
 "Storage" => "Úložiště",
 "change display name" => "změnit zobrazované jméno",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 01c59d242c7..294bd918213 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Kunne ikke indlæse listen fra App Store",
+"Authentication error" => "Adgangsfejl",
 "Group already exists" => "Gruppen findes allerede",
 "Unable to add group" => "Gruppen kan ikke oprettes",
 "Could not enable app. " => "Applikationen kunne ikke aktiveres.",
 "Email saved" => "Email adresse gemt",
 "Invalid email" => "Ugyldig email adresse",
 "Unable to delete group" => "Gruppen kan ikke slettes",
-"Authentication error" => "Adgangsfejl",
 "Unable to delete user" => "Bruger kan ikke slettes",
 "Language changed" => "Sprog ændret",
 "Invalid request" => "Ugyldig forespørgsel",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 04f65222b01..b7ace81cf59 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
+"Authentication error" => "Fehler bei der Anmeldung",
 "Group already exists" => "Gruppe existiert bereits",
 "Unable to add group" => "Gruppe konnte nicht angelegt werden",
 "Could not enable app. " => "App konnte nicht aktiviert werden.",
 "Email saved" => "E-Mail Adresse gespeichert",
 "Invalid email" => "Ungültige E-Mail Adresse",
 "Unable to delete group" => "Gruppe konnte nicht gelöscht werden",
-"Authentication error" => "Fehler bei der Anmeldung",
 "Unable to delete user" => "Benutzer konnte nicht gelöscht werden",
 "Language changed" => "Sprache geändert",
 "Invalid request" => "Ungültige Anfrage",
@@ -43,6 +43,7 @@
 "New password" => "Neues Passwort",
 "show" => "zeigen",
 "Change password" => "Passwort ändern",
+"Display Name" => "Anzeigename",
 "Email" => "E-Mail",
 "Your email address" => "Deine E-Mail-Adresse",
 "Fill in an email address to enable password recovery" => "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
@@ -58,7 +59,6 @@
 "Default Storage" => "Standard-Speicher",
 "Unlimited" => "Unbegrenzt",
 "Other" => "Andere",
-"Display Name" => "Anzeigename",
 "Group Admin" => "Gruppenadministrator",
 "Storage" => "Speicher",
 "change display name" => "Anzeigenamen ändern",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 5358212dbcd..ab8c791bbe0 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -1,12 +1,13 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
+"Authentication error" => "Fehler bei der Anmeldung",
+"Unable to change display name" => "Das Ändern des Anzeigenamens ist nicht möglich",
 "Group already exists" => "Die Gruppe existiert bereits",
 "Unable to add group" => "Die Gruppe konnte nicht angelegt werden",
 "Could not enable app. " => "Die Anwendung konnte nicht aktiviert werden.",
 "Email saved" => "E-Mail-Adresse gespeichert",
 "Invalid email" => "Ungültige E-Mail-Adresse",
 "Unable to delete group" => "Die Gruppe konnte nicht gelöscht werden",
-"Authentication error" => "Fehler bei der Anmeldung",
 "Unable to delete user" => "Der Benutzer konnte nicht gelöscht werden",
 "Language changed" => "Sprache geändert",
 "Invalid request" => "Ungültige Anfrage",
@@ -48,6 +49,10 @@
 "New password" => "Neues Passwort",
 "show" => "zeigen",
 "Change password" => "Passwort ändern",
+"Display Name" => "Anzeigename",
+"Your display name was changed" => "Dein Anzeigename wurde geändert",
+"Unable to change your display name" => "Das Ändern deines Anzeigenamens ist nicht möglich",
+"Change display name" => "Anzeigenamen ändern",
 "Email" => "E-Mail",
 "Your email address" => "Ihre E-Mail-Adresse",
 "Fill in an email address to enable password recovery" => "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
@@ -63,7 +68,6 @@
 "Default Storage" => "Standard-Speicher",
 "Unlimited" => "Unbegrenzt",
 "Other" => "Andere",
-"Display Name" => "Anzeigename",
 "Group Admin" => "Gruppenadministrator",
 "Storage" => "Speicher",
 "change display name" => "Anzeigenamen ändern",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 90335ceaf02..925ecf695aa 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Σφάλμα στην φόρτωση της λίστας από το App Store",
+"Authentication error" => "Σφάλμα πιστοποίησης",
 "Group already exists" => "Η ομάδα υπάρχει ήδη",
 "Unable to add group" => "Αδυναμία προσθήκης ομάδας",
 "Could not enable app. " => "Αδυναμία ενεργοποίησης εφαρμογής ",
 "Email saved" => "Το email αποθηκεύτηκε ",
 "Invalid email" => "Μη έγκυρο email",
 "Unable to delete group" => "Αδυναμία διαγραφής ομάδας",
-"Authentication error" => "Σφάλμα πιστοποίησης",
 "Unable to delete user" => "Αδυναμία διαγραφής χρήστη",
 "Language changed" => "Η γλώσσα άλλαξε",
 "Invalid request" => "Μη έγκυρο αίτημα",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index d9a7595255c..f84526c3c91 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ne eblis ŝargi liston el aplikaĵovendejo",
+"Authentication error" => "Aŭtentiga eraro",
 "Group already exists" => "La grupo jam ekzistas",
 "Unable to add group" => "Ne eblis aldoni la grupon",
 "Could not enable app. " => "Ne eblis kapabligi la aplikaĵon.",
 "Email saved" => "La retpoŝtadreso konserviĝis",
 "Invalid email" => "Nevalida retpoŝtadreso",
 "Unable to delete group" => "Ne eblis forigi la grupon",
-"Authentication error" => "Aŭtentiga eraro",
 "Unable to delete user" => "Ne eblis forigi la uzanton",
 "Language changed" => "La lingvo estas ŝanĝita",
 "Invalid request" => "Nevalida peto",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index e0649587a44..1b4fd6ac7a6 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,12 +1,13 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
+"Authentication error" => "Error de autenticación",
+"Unable to change display name" => "Incapaz de cambiar el nombre",
 "Group already exists" => "El grupo ya existe",
 "Unable to add group" => "No se pudo añadir el grupo",
 "Could not enable app. " => "No puedo habilitar la app.",
 "Email saved" => "Correo guardado",
 "Invalid email" => "Correo no válido",
 "Unable to delete group" => "No se pudo eliminar el grupo",
-"Authentication error" => "Error de autenticación",
 "Unable to delete user" => "No se pudo eliminar el usuario",
 "Language changed" => "Idioma cambiado",
 "Invalid request" => "Solicitud no válida",
@@ -48,6 +49,10 @@
 "New password" => "Nueva contraseña:",
 "show" => "mostrar",
 "Change password" => "Cambiar contraseña",
+"Display Name" => "Nombre a mostrar",
+"Your display name was changed" => "Su nombre fue cambiado",
+"Unable to change your display name" => "Incapaz de cambiar su nombre",
+"Change display name" => "Cambiar nombre",
 "Email" => "Correo electrónico",
 "Your email address" => "Tu dirección de correo",
 "Fill in an email address to enable password recovery" => "Escribe una dirección de correo electrónico para restablecer la contraseña",
@@ -63,7 +68,6 @@
 "Default Storage" => "Almacenamiento Predeterminado",
 "Unlimited" => "Ilimitado",
 "Other" => "Otro",
-"Display Name" => "Nombre a mostrar",
 "Group Admin" => "Grupo admin",
 "Storage" => "Alamacenamiento",
 "change display name" => "Cambiar nombre a mostrar",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index 3ef0756ede7..a33d9e8063d 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
+"Authentication error" => "Error al autenticar",
 "Group already exists" => "El grupo ya existe",
 "Unable to add group" => "No fue posible añadir el grupo",
 "Could not enable app. " => "No se puede  habilitar la aplicación.",
 "Email saved" => "e-mail guardado",
 "Invalid email" => "el e-mail no es válido ",
 "Unable to delete group" => "No fue posible eliminar el grupo",
-"Authentication error" => "Error al autenticar",
 "Unable to delete user" => "No fue posible eliminar el usuario",
 "Language changed" => "Idioma cambiado",
 "Invalid request" => "Solicitud no válida",
@@ -42,6 +42,7 @@
 "New password" => "Nueva contraseña:",
 "show" => "mostrar",
 "Change password" => "Cambiar contraseña",
+"Display Name" => "Nombre a mostrar",
 "Email" => "Correo electrónico",
 "Your email address" => "Tu dirección de e-mail",
 "Fill in an email address to enable password recovery" => "Escribí una dirección de correo electrónico para restablecer la contraseña",
@@ -57,7 +58,6 @@
 "Default Storage" => "Almacenamiento Predeterminado",
 "Unlimited" => "Ilimitado",
 "Other" => "Otro",
-"Display Name" => "Nombre a mostrar",
 "Group Admin" => "Grupo Administrador",
 "Storage" => "Almacenamiento",
 "Default" => "Predeterminado",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 3f99aed1b88..df5b707fcd5 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "App Sotre'i nimekirja laadimine ebaõnnestus",
+"Authentication error" => "Autentimise viga",
 "Group already exists" => "Grupp on juba olemas",
 "Unable to add group" => "Keela grupi lisamine",
 "Could not enable app. " => "Rakenduse sisselülitamine ebaõnnestus.",
 "Email saved" => "Kiri on salvestatud",
 "Invalid email" => "Vigane e-post",
 "Unable to delete group" => "Keela grupi kustutamine",
-"Authentication error" => "Autentimise viga",
 "Unable to delete user" => "Keela kasutaja kustutamine",
 "Language changed" => "Keel on muudetud",
 "Invalid request" => "Vigane päring",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 4a6cdc365ec..1be2c7940bc 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ezin izan da App Dendatik zerrenda kargatu",
+"Authentication error" => "Autentifikazio errorea",
 "Group already exists" => "Taldea dagoeneko existitzenda",
 "Unable to add group" => "Ezin izan da taldea gehitu",
 "Could not enable app. " => "Ezin izan da aplikazioa gaitu.",
 "Email saved" => "Eposta gorde da",
 "Invalid email" => "Baliogabeko eposta",
 "Unable to delete group" => "Ezin izan da taldea ezabatu",
-"Authentication error" => "Autentifikazio errorea",
 "Unable to delete user" => "Ezin izan da erabiltzailea ezabatu",
 "Language changed" => "Hizkuntza aldatuta",
 "Invalid request" => "Baliogabeko eskaria",
@@ -42,6 +42,7 @@
 "New password" => "Pasahitz berria",
 "show" => "erakutsi",
 "Change password" => "Aldatu pasahitza",
+"Display Name" => "Bistaratze Izena",
 "Email" => "E-Posta",
 "Your email address" => "Zure e-posta",
 "Fill in an email address to enable password recovery" => "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko",
@@ -57,7 +58,6 @@
 "Default Storage" => "Lehenetsitako Biltegiratzea",
 "Unlimited" => "Mugarik gabe",
 "Other" => "Besteak",
-"Display Name" => "Bistaratze Izena",
 "Group Admin" => "Talde administradorea",
 "Storage" => "Biltegiratzea",
 "Default" => "Lehenetsia",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 0d35ddc226b..d4290f6dee7 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -1,11 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "قادر به بارگذاری لیست از فروشگاه اپ نیستم",
+"Authentication error" => "خطا در اعتبار سنجی",
 "Group already exists" => "این گروه در حال حاضر موجود است",
 "Unable to add group" => "افزودن گروه امکان پذیر نیست",
 "Email saved" => "ایمیل ذخیره شد",
 "Invalid email" => "ایمیل غیر قابل قبول",
 "Unable to delete group" => "حذف گروه امکان پذیر نیست",
-"Authentication error" => "خطا در اعتبار سنجی",
 "Unable to delete user" => "حذف کاربر امکان پذیر نیست",
 "Language changed" => "زبان تغییر کرد",
 "Invalid request" => "درخواست غیر قابل قبول",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index c1763dca15e..9f1feb74a11 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ei pystytä lataamaan listaa sovellusvarastosta (App Store)",
+"Authentication error" => "Todennusvirhe",
 "Group already exists" => "Ryhmä on jo olemassa",
 "Unable to add group" => "Ryhmän lisäys epäonnistui",
 "Could not enable app. " => "Sovelluksen käyttöönotto epäonnistui.",
 "Email saved" => "Sähköposti tallennettu",
 "Invalid email" => "Virheellinen sähköposti",
 "Unable to delete group" => "Ryhmän poisto epäonnistui",
-"Authentication error" => "Todennusvirhe",
 "Unable to delete user" => "Käyttäjän poisto epäonnistui",
 "Language changed" => "Kieli on vaihdettu",
 "Invalid request" => "Virheellinen pyyntö",
@@ -48,6 +48,7 @@
 "New password" => "Uusi salasana",
 "show" => "näytä",
 "Change password" => "Vaihda salasana",
+"Display Name" => "Näyttönimi",
 "Email" => "Sähköposti",
 "Your email address" => "Sähköpostiosoitteesi",
 "Fill in an email address to enable password recovery" => "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa",
@@ -62,7 +63,6 @@
 "Create" => "Luo",
 "Unlimited" => "Rajoittamaton",
 "Other" => "Muu",
-"Display Name" => "Näyttönimi",
 "Group Admin" => "Ryhmän ylläpitäjä",
 "change display name" => "vaihda näyttönimi",
 "set new password" => "aseta uusi salasana",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index b870b56607c..a47acb6435f 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,12 +1,13 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Impossible de charger la liste depuis l'App Store",
+"Authentication error" => "Erreur d'authentification",
+"Unable to change display name" => "Impossible de modifier le nom d'affichage",
 "Group already exists" => "Ce groupe existe déjà",
 "Unable to add group" => "Impossible d'ajouter le groupe",
 "Could not enable app. " => "Impossible d'activer l'Application",
 "Email saved" => "E-mail sauvegardé",
 "Invalid email" => "E-mail invalide",
 "Unable to delete group" => "Impossible de supprimer le groupe",
-"Authentication error" => "Erreur d'authentification",
 "Unable to delete user" => "Impossible de supprimer l'utilisateur",
 "Language changed" => "Langue changée",
 "Invalid request" => "Requête invalide",
@@ -48,6 +49,10 @@
 "New password" => "Nouveau mot de passe",
 "show" => "Afficher",
 "Change password" => "Changer de mot de passe",
+"Display Name" => "Nom affiché",
+"Your display name was changed" => "Votre nom d'affichage a bien été modifié",
+"Unable to change your display name" => "Impossible de modifier votre nom d'affichage",
+"Change display name" => "Changer le nom affiché",
 "Email" => "E-mail",
 "Your email address" => "Votre adresse e-mail",
 "Fill in an email address to enable password recovery" => "Entrez votre adresse e-mail pour permettre la réinitialisation du mot de passe",
@@ -63,7 +68,6 @@
 "Default Storage" => "Support de stockage par défaut",
 "Unlimited" => "Illimité",
 "Other" => "Autre",
-"Display Name" => "Nom affiché",
 "Group Admin" => "Groupe Admin",
 "Storage" => "Support de stockage",
 "change display name" => "Changer le nom affiché",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 595248f7c55..997ac53de7e 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Non foi posíbel cargar a lista desde a App Store",
+"Authentication error" => "Produciuse un erro de autenticación",
 "Group already exists" => "O grupo xa existe",
 "Unable to add group" => "Non é posíbel engadir o grupo",
 "Could not enable app. " => "Non é posíbel activar o aplicativo.",
 "Email saved" => "Correo gardado",
 "Invalid email" => "correo incorrecto",
 "Unable to delete group" => "Non é posíbel eliminar o grupo.",
-"Authentication error" => "Produciuse un erro de autenticación",
 "Unable to delete user" => "Non é posíbel eliminar o usuario",
 "Language changed" => "O idioma cambiou",
 "Invalid request" => "Petición incorrecta",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index a3db2b9a36c..be776d4fa2e 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "לא ניתן לטעון רשימה מה־App Store",
+"Authentication error" => "שגיאת הזדהות",
 "Group already exists" => "הקבוצה כבר קיימת",
 "Unable to add group" => "לא ניתן להוסיף קבוצה",
 "Could not enable app. " => "לא ניתן להפעיל את היישום",
 "Email saved" => "הדוא״ל נשמר",
 "Invalid email" => "דוא״ל לא חוקי",
 "Unable to delete group" => "לא ניתן למחוק את הקבוצה",
-"Authentication error" => "שגיאת הזדהות",
 "Unable to delete user" => "לא ניתן למחוק את המשתמש",
 "Language changed" => "שפה השתנתה",
 "Invalid request" => "בקשה לא חוקית",
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 0548b0f84c7..f55cdcc687a 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nemogićnost učitavanja liste sa Apps Stora",
+"Authentication error" => "Greška kod autorizacije",
 "Email saved" => "Email spremljen",
 "Invalid email" => "Neispravan email",
-"Authentication error" => "Greška kod autorizacije",
 "Language changed" => "Jezik promijenjen",
 "Invalid request" => "Neispravan zahtjev",
 "Disable" => "Isključi",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index d56ff7aa58a..23d6c3f5f78 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nem tölthető le a lista az App Store-ból",
+"Authentication error" => "Azonosítási hiba",
 "Group already exists" => "A csoport már létezik",
 "Unable to add group" => "A csoport nem hozható létre",
 "Could not enable app. " => "A program nem aktiválható.",
 "Email saved" => "Email mentve",
 "Invalid email" => "Hibás email",
 "Unable to delete group" => "A csoport nem törölhető",
-"Authentication error" => "Azonosítási hiba",
 "Unable to delete user" => "A felhasználó nem törölhető",
 "Language changed" => "A nyelv megváltozott",
 "Invalid request" => "Érvénytelen kérés",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 6a4d7a292b5..181450e58ba 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -1,7 +1,7 @@
 <?php $TRANSLATIONS = array(
+"Authentication error" => "autentikasi bermasalah",
 "Email saved" => "Email tersimpan",
 "Invalid email" => "Email tidak sah",
-"Authentication error" => "autentikasi bermasalah",
 "Language changed" => "Bahasa telah diganti",
 "Invalid request" => "Permintaan tidak valid",
 "Disable" => "NonAktifkan",
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index 2421916a5c3..75f46a01925 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ekki tókst að hlaða lista frá forrita síðu",
+"Authentication error" => "Villa við auðkenningu",
 "Group already exists" => "Hópur er þegar til",
 "Unable to add group" => "Ekki tókst að bæta við hóp",
 "Could not enable app. " => "Gat ekki virkjað forrit",
 "Email saved" => "Netfang vistað",
 "Invalid email" => "Ógilt netfang",
 "Unable to delete group" => "Ekki tókst að eyða hóp",
-"Authentication error" => "Villa við auðkenningu",
 "Unable to delete user" => "Ekki tókst að eyða notenda",
 "Language changed" => "Tungumáli breytt",
 "Invalid request" => "Ógild fyrirspurn",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 714c5c29c4c..7f860f69edc 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -1,12 +1,13 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Impossibile caricare l'elenco dall'App Store",
+"Authentication error" => "Errore di autenticazione",
+"Unable to change display name" => "Impossibile cambiare il nome visualizzato",
 "Group already exists" => "Il gruppo esiste già",
 "Unable to add group" => "Impossibile aggiungere il gruppo",
 "Could not enable app. " => "Impossibile abilitare l'applicazione.",
 "Email saved" => "Email salvata",
 "Invalid email" => "Email non valida",
 "Unable to delete group" => "Impossibile eliminare il gruppo",
-"Authentication error" => "Errore di autenticazione",
 "Unable to delete user" => "Impossibile eliminare l'utente",
 "Language changed" => "Lingua modificata",
 "Invalid request" => "Richiesta non valida",
@@ -48,6 +49,10 @@
 "New password" => "Nuova password",
 "show" => "mostra",
 "Change password" => "Modifica password",
+"Display Name" => "Nome visualizzato",
+"Your display name was changed" => "Il tuo nome visualizzato è stato cambiato",
+"Unable to change your display name" => "Impossibile cambiare il tuo nome visualizzato",
+"Change display name" => "Cambia il nome visualizzato",
 "Email" => "Email",
 "Your email address" => "Il tuo indirizzo email",
 "Fill in an email address to enable password recovery" => "Inserisci il tuo indirizzo email per abilitare il recupero della password",
@@ -63,7 +68,6 @@
 "Default Storage" => "Archiviazione predefinita",
 "Unlimited" => "Illimitata",
 "Other" => "Altro",
-"Display Name" => "Nome visualizzato",
 "Group Admin" => "Gruppi amministrati",
 "Storage" => "Archiviazione",
 "change display name" => "cambia il nome visualizzato",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 41f16051fe8..d255b670337 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -1,12 +1,13 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "アプリストアからリストをロードできません",
+"Authentication error" => "認証エラー",
+"Unable to change display name" => "表示名を変更できません",
 "Group already exists" => "グループは既に存在しています",
 "Unable to add group" => "グループを追加できません",
 "Could not enable app. " => "アプリを有効にできませんでした。",
 "Email saved" => "メールアドレスを保存しました",
 "Invalid email" => "無効なメールアドレス",
 "Unable to delete group" => "グループを削除できません",
-"Authentication error" => "認証エラー",
 "Unable to delete user" => "ユーザを削除できません",
 "Language changed" => "言語が変更されました",
 "Invalid request" => "無効なリクエストです",
@@ -48,6 +49,10 @@
 "New password" => "新しいパスワード",
 "show" => "表示",
 "Change password" => "パスワードを変更",
+"Display Name" => "表示名",
+"Your display name was changed" => "あなたの表示名を変更しました",
+"Unable to change your display name" => "あなたの表示名を変更できません",
+"Change display name" => "表示名を変更",
 "Email" => "Email",
 "Your email address" => "あなたのメールアドレス",
 "Fill in an email address to enable password recovery" => "※パスワード回復を有効にするにはメールアドレスの入力が必要です",
@@ -63,7 +68,6 @@
 "Default Storage" => "デフォルトストレージ",
 "Unlimited" => "無制限",
 "Other" => "その他",
-"Display Name" => "表示名",
 "Group Admin" => "グループ管理者",
 "Storage" => "ストレージ",
 "change display name" => "表示名を変更",
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index 346c89dbc7d..0fc42d42728 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "აპლიკაციების სია ვერ ჩამოიტვირთა App Store",
+"Authentication error" => "ავთენტიფიკაციის შეცდომა",
 "Group already exists" => "ჯგუფი უკვე არსებობს",
 "Unable to add group" => "ჯგუფის დამატება ვერ მოხერხდა",
 "Could not enable app. " => "ვერ მოხერხდა აპლიკაციის ჩართვა.",
 "Email saved" => "იმეილი შენახულია",
 "Invalid email" => "არასწორი იმეილი",
 "Unable to delete group" => "ჯგუფის წაშლა ვერ მოხერხდა",
-"Authentication error" => "ავთენტიფიკაციის შეცდომა",
 "Unable to delete user" => "მომხმარებლის წაშლა ვერ მოხერხდა",
 "Language changed" => "ენა შეცვლილია",
 "Invalid request" => "არასწორი მოთხოვნა",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index e82ecaeba6b..a542b35feec 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "앱 스토어에서 목록을 가져올 수 없습니다",
+"Authentication error" => "인증 오류",
 "Group already exists" => "그룹이 이미 존재합니다.",
 "Unable to add group" => "그룹을 추가할 수 없습니다.",
 "Could not enable app. " => "앱을 활성화할 수 없습니다.",
 "Email saved" => "이메일 저장됨",
 "Invalid email" => "잘못된 이메일 주소",
 "Unable to delete group" => "그룹을 삭제할 수 없습니다.",
-"Authentication error" => "인증 오류",
 "Unable to delete user" => "사용자를 삭제할 수 없습니다.",
 "Language changed" => "언어가 변경되었습니다",
 "Invalid request" => "잘못된 요청",
@@ -42,6 +42,7 @@
 "New password" => "새 암호",
 "show" => "보이기",
 "Change password" => "암호 변경",
+"Display Name" => "표시 이름",
 "Email" => "이메일",
 "Your email address" => "이메일 주소",
 "Fill in an email address to enable password recovery" => "암호 찾기 기능을 사용하려면 이메일 주소를 입력하십시오.",
@@ -57,7 +58,6 @@
 "Default Storage" => "기본 저장소",
 "Unlimited" => "무제한",
 "Other" => "기타",
-"Display Name" => "표시 이름",
 "Group Admin" => "그룹 관리자",
 "Storage" => "저장소",
 "change display name" => "표시 이름 변경",
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index 1c8cff81b0f..5ef88f27891 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Konnt Lescht net vum App Store lueden",
+"Authentication error" => "Authentifikatioun's Fehler",
 "Email saved" => "E-mail gespäichert",
 "Invalid email" => "Ongülteg e-mail",
-"Authentication error" => "Authentifikatioun's Fehler",
 "Language changed" => "Sprooch huet geännert",
 "Invalid request" => "Ongülteg Requête",
 "Disable" => "Ofschalten",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 335505b4539..e514e7f7758 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Neįmanoma įkelti sąrašo iš Programų Katalogo",
+"Authentication error" => "Autentikacijos klaida",
 "Could not enable app. " => "Nepavyksta įjungti aplikacijos.",
 "Email saved" => "El. paštas išsaugotas",
 "Invalid email" => "Netinkamas el. paštas",
-"Authentication error" => "Autentikacijos klaida",
 "Language changed" => "Kalba pakeista",
 "Invalid request" => "Klaidinga užklausa",
 "Disable" => "Išjungti",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index efbbc8f1abd..03977206f77 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -1,12 +1,13 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nevar lejupielādēt sarakstu no lietotņu veikala",
+"Authentication error" => "Autentifikācijas kļūda",
+"Unable to change display name" => "Nevarēja mainīt redzamo vārdu",
 "Group already exists" => "Grupa jau eksistē",
 "Unable to add group" => "Nevar pievienot grupu",
 "Could not enable app. " => "Nevarēja aktivēt lietotni.",
 "Email saved" => "E-pasts tika saglabāts",
 "Invalid email" => "Nederīgs epasts",
 "Unable to delete group" => "Nevar izdzēst grupu",
-"Authentication error" => "Autentifikācijas kļūda",
 "Unable to delete user" => "Nevar izdzēst lietotāju",
 "Language changed" => "Valoda tika nomainīta",
 "Invalid request" => "Nederīgs pieprasījums",
@@ -48,6 +49,10 @@
 "New password" => "Jauna parole",
 "show" => "parādīt",
 "Change password" => "Mainīt paroli",
+"Display Name" => "Redzamais vārds",
+"Your display name was changed" => "Jūsu redzamais vārds tika mainīts",
+"Unable to change your display name" => "Nevarēja mainīt jūsu redzamo vārdu",
+"Change display name" => "Mainīt redzamo vārdu",
 "Email" => "E-pasts",
 "Your email address" => "Jūsu e-pasta adrese",
 "Fill in an email address to enable password recovery" => "Ievadiet epasta adresi, lai vēlāk varētu atgūt paroli, ja būs nepieciešamība",
@@ -63,7 +68,6 @@
 "Default Storage" => "Noklusējuma krātuve",
 "Unlimited" => "Neierobežota",
 "Other" => "Cits",
-"Display Name" => "Redzamais vārds",
 "Group Admin" => "Grupas administrators",
 "Storage" => "Krātuve",
 "change display name" => "mainīt redzamo vārdu",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 7705b870b37..aba63bc0575 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Неможам да вчитам листа од App Store",
+"Authentication error" => "Грешка во автентикација",
 "Group already exists" => "Групата веќе постои",
 "Unable to add group" => "Неможе да додадам група",
 "Could not enable app. " => "Неможе да овозможам апликација.",
 "Email saved" => "Електронската пошта е снимена",
 "Invalid email" => "Неисправна електронска пошта",
 "Unable to delete group" => "Неможе да избришам група",
-"Authentication error" => "Грешка во автентикација",
 "Unable to delete user" => "Неможам да избришам корисник",
 "Language changed" => "Јазикот е сменет",
 "Invalid request" => "неправилно барање",
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index 22114cfc2dd..95c1d01e3b5 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -1,7 +1,7 @@
 <?php $TRANSLATIONS = array(
+"Authentication error" => "Ralat pengesahan",
 "Email saved" => "Emel disimpan",
 "Invalid email" => "Emel tidak sah",
-"Authentication error" => "Ralat pengesahan",
 "Language changed" => "Bahasa diubah",
 "Invalid request" => "Permintaan tidak sah",
 "Disable" => "Nyahaktif",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 0e627120bd6..caf0a551863 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Lasting av liste fra App Store feilet.",
+"Authentication error" => "Autentikasjonsfeil",
 "Group already exists" => "Gruppen finnes allerede",
 "Unable to add group" => "Kan ikke legge til gruppe",
 "Could not enable app. " => "Kan ikke aktivere app.",
 "Email saved" => "Epost lagret",
 "Invalid email" => "Ugyldig epost",
 "Unable to delete group" => "Kan ikke slette gruppe",
-"Authentication error" => "Autentikasjonsfeil",
 "Unable to delete user" => "Kan ikke slette bruker",
 "Language changed" => "Språk endret",
 "Invalid request" => "Ugyldig forespørsel",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 72c9108ef9c..6c256b9388d 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -1,12 +1,13 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Kan de lijst niet van de App store laden",
+"Authentication error" => "Authenticatie fout",
+"Unable to change display name" => "Kon de weergavenaam niet wijzigen",
 "Group already exists" => "Groep bestaat al",
 "Unable to add group" => "Niet in staat om groep toe te voegen",
 "Could not enable app. " => "Kan de app. niet activeren",
 "Email saved" => "E-mail bewaard",
 "Invalid email" => "Ongeldige e-mail",
 "Unable to delete group" => "Niet in staat om groep te verwijderen",
-"Authentication error" => "Authenticatie fout",
 "Unable to delete user" => "Niet in staat om gebruiker te verwijderen",
 "Language changed" => "Taal aangepast",
 "Invalid request" => "Ongeldig verzoek",
@@ -18,6 +19,7 @@
 "Disable" => "Uitschakelen",
 "Enable" => "Inschakelen",
 "Please wait...." => "Even geduld aub....",
+"Updating...." => "Bijwerken....",
 "Error while updating app" => "Fout bij bijwerken app",
 "Error" => "Fout",
 "Updated" => "Bijgewerkt",
@@ -47,6 +49,10 @@
 "New password" => "Nieuw wachtwoord",
 "show" => "weergeven",
 "Change password" => "Wijzig wachtwoord",
+"Display Name" => "Weergavenaam",
+"Your display name was changed" => "Uw weergavenaam is gewijzigd",
+"Unable to change your display name" => "Kon de weergavenaam niet wijzigen",
+"Change display name" => "Wijzig weergavenaam",
 "Email" => "E-mailadres",
 "Your email address" => "Uw e-mailadres",
 "Fill in an email address to enable password recovery" => "Vul een e-mailadres in om wachtwoord reset uit te kunnen voeren",
@@ -62,7 +68,6 @@
 "Default Storage" => "Default opslag",
 "Unlimited" => "Ongelimiteerd",
 "Other" => "Andere",
-"Display Name" => "Weergavenaam",
 "Group Admin" => "Groep beheerder",
 "Storage" => "Opslag",
 "change display name" => "wijzig weergavenaam",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 279939b3d34..8faa2d02caa 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Klarer ikkje å laste inn liste fra App Store",
+"Authentication error" => "Feil i autentisering",
 "Email saved" => "E-postadresse lagra",
 "Invalid email" => "Ugyldig e-postadresse",
-"Authentication error" => "Feil i autentisering",
 "Language changed" => "Språk endra",
 "Invalid request" => "Ugyldig førespurnad",
 "Disable" => "Slå av",
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
index c89fa2ae505..9accb3acbab 100644
--- a/settings/l10n/oc.php
+++ b/settings/l10n/oc.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Pas possible de cargar la tièra dempuèi App Store",
+"Authentication error" => "Error d'autentificacion",
 "Group already exists" => "Lo grop existís ja",
 "Unable to add group" => "Pas capable d'apondre  un grop",
 "Could not enable app. " => "Pòt pas activar app. ",
 "Email saved" => "Corrièl enregistrat",
 "Invalid email" => "Corrièl incorrècte",
 "Unable to delete group" => "Pas capable d'escafar un grop",
-"Authentication error" => "Error d'autentificacion",
 "Unable to delete user" => "Pas capable d'escafar un usancièr",
 "Language changed" => "Lengas cambiadas",
 "Invalid request" => "Demanda invalida",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 9c05904f259..a06b39e7bd2 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nie mogę załadować listy aplikacji",
+"Authentication error" => "Błąd uwierzytelniania",
 "Group already exists" => "Grupa już istnieje",
 "Unable to add group" => "Nie można dodać grupy",
 "Could not enable app. " => "Nie można włączyć aplikacji.",
 "Email saved" => "Email zapisany",
 "Invalid email" => "Niepoprawny email",
 "Unable to delete group" => "Nie można usunąć grupy",
-"Authentication error" => "Błąd uwierzytelniania",
 "Unable to delete user" => "Nie można usunąć użytkownika",
 "Language changed" => "Język zmieniony",
 "Invalid request" => "Nieprawidłowe żądanie",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index a9285d8c407..5a8281446db 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Não foi possível carregar lista da App Store",
+"Authentication error" => "Erro de autenticação",
 "Group already exists" => "Grupo já existe",
 "Unable to add group" => "Não foi possível adicionar grupo",
 "Could not enable app. " => "Não foi possível habilitar aplicativo.",
 "Email saved" => "E-mail guardado",
 "Invalid email" => "E-mail inválido",
 "Unable to delete group" => "Não foi possível remover grupo",
-"Authentication error" => "Erro de autenticação",
 "Unable to delete user" => "Não foi possível remover usuário",
 "Language changed" => "Idioma alterado",
 "Invalid request" => "Pedido inválido",
@@ -41,6 +41,7 @@
 "New password" => "Nova senha",
 "show" => "mostrar",
 "Change password" => "Alterar senha",
+"Display Name" => "Nome de Exibição",
 "Email" => "E-mail",
 "Your email address" => "Seu endereço de e-mail",
 "Fill in an email address to enable password recovery" => "Preencha um endereço de e-mail para habilitar a recuperação de senha",
@@ -56,7 +57,6 @@
 "Default Storage" => "Armazenamento Padrão",
 "Unlimited" => "Ilimitado",
 "Other" => "Outro",
-"Display Name" => "Nome de Exibição",
 "Group Admin" => "Grupo Administrativo",
 "Storage" => "Armazenamento",
 "Default" => "Padrão",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 243dbeb8562..03982fd5e8e 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Incapaz de carregar a lista da App Store",
+"Authentication error" => "Erro de autenticação",
 "Group already exists" => "O grupo já existe",
 "Unable to add group" => "Impossível acrescentar o grupo",
 "Could not enable app. " => "Não foi possível activar a app.",
 "Email saved" => "Email guardado",
 "Invalid email" => "Email inválido",
 "Unable to delete group" => "Impossível apagar grupo",
-"Authentication error" => "Erro de autenticação",
 "Unable to delete user" => "Impossível apagar utilizador",
 "Language changed" => "Idioma alterado",
 "Invalid request" => "Pedido inválido",
@@ -48,6 +48,7 @@
 "New password" => "Nova palavra-chave",
 "show" => "mostrar",
 "Change password" => "Alterar palavra-chave",
+"Display Name" => "Nome público",
 "Email" => "endereço de email",
 "Your email address" => "O seu endereço de email",
 "Fill in an email address to enable password recovery" => "Preencha com o seu endereço de email para ativar a recuperação da palavra-chave",
@@ -63,7 +64,6 @@
 "Default Storage" => "Armazenamento Padrão",
 "Unlimited" => "Ilimitado",
 "Other" => "Outro",
-"Display Name" => "Nome público",
 "Group Admin" => "Grupo Administrador",
 "Storage" => "Armazenamento",
 "change display name" => "modificar nome exibido",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index d244bad31ba..dcc55a843dc 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Imposibil de încărcat lista din App Store",
+"Authentication error" => "Eroare de autentificare",
 "Group already exists" => "Grupul există deja",
 "Unable to add group" => "Nu s-a putut adăuga grupul",
 "Could not enable app. " => "Nu s-a putut activa aplicația.",
 "Email saved" => "E-mail salvat",
 "Invalid email" => "E-mail nevalid",
 "Unable to delete group" => "Nu s-a putut șterge grupul",
-"Authentication error" => "Eroare de autentificare",
 "Unable to delete user" => "Nu s-a putut șterge utilizatorul",
 "Language changed" => "Limba a fost schimbată",
 "Invalid request" => "Cerere eronată",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index c364be95e51..4c01951c508 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,21 +1,28 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Загрузка из App Store запрещена",
+"Authentication error" => "Ошибка авторизации",
+"Unable to change display name" => "Невозможно изменить отображаемое имя",
 "Group already exists" => "Группа уже существует",
 "Unable to add group" => "Невозможно добавить группу",
 "Could not enable app. " => "Не удалось включить приложение.",
 "Email saved" => "Email сохранен",
 "Invalid email" => "Неправильный Email",
 "Unable to delete group" => "Невозможно удалить группу",
-"Authentication error" => "Ошибка авторизации",
 "Unable to delete user" => "Невозможно удалить пользователя",
 "Language changed" => "Язык изменён",
 "Invalid request" => "Неверный запрос",
 "Admins can't remove themself from the admin group" => "Администратор не может удалить сам себя из группы admin",
 "Unable to add user to group %s" => "Невозможно добавить пользователя в группу %s",
 "Unable to remove user from group %s" => "Невозможно удалить пользователя из группы %s",
+"Couldn't update app." => "Невозможно обновить приложение",
+"Update to {appversion}" => "Обновить до {версия приложения}",
 "Disable" => "Выключить",
 "Enable" => "Включить",
+"Please wait...." => "Повремени...",
+"Updating...." => "Обновление...",
+"Error while updating app" => "Ошибка в процессе обновления приложения",
 "Error" => "Ошибка",
+"Updated" => "Обновлено",
 "Saving..." => "Сохранение...",
 "__language_name__" => "Русский ",
 "Add your App" => "Добавить приложение",
@@ -42,6 +49,10 @@
 "New password" => "Новый пароль",
 "show" => "показать",
 "Change password" => "Сменить пароль",
+"Display Name" => "Отображаемое имя",
+"Your display name was changed" => "Ваше отображаемое имя было изменено",
+"Unable to change your display name" => "Невозможно изменить Ваше отображаемое имя",
+"Change display name" => "Изменить отображаемое имя",
 "Email" => "e-mail",
 "Your email address" => "Ваш адрес электронной почты",
 "Fill in an email address to enable password recovery" => "Введите адрес электронной почты, чтобы появилась возможность восстановления пароля",
@@ -51,6 +62,7 @@
 "Use this address to connect to your ownCloud in your file manager" => "Используйте этот URL для подключения файлового менеджера к Вашему хранилищу",
 "Version" => "Версия",
 "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=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"Login Name" => "Имя пользователя",
 "Groups" => "Группы",
 "Create" => "Создать",
 "Default Storage" => "Хранилище по-умолчанию",
@@ -58,6 +70,8 @@
 "Other" => "Другое",
 "Group Admin" => "Группа Администраторы",
 "Storage" => "Хранилище",
+"change display name" => "изменить отображаемое имя",
+"set new password" => "установить новый пароль",
 "Default" => "По-умолчанию",
 "Delete" => "Удалить"
 );
diff --git a/settings/l10n/ru_RU.php b/settings/l10n/ru_RU.php
index 8d9ecf7e55e..7dde545e2ed 100644
--- a/settings/l10n/ru_RU.php
+++ b/settings/l10n/ru_RU.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Невозможно загрузить список из App Store",
+"Authentication error" => "Ошибка авторизации",
 "Group already exists" => "Группа уже существует",
 "Unable to add group" => "Невозможно добавить группу",
 "Could not enable app. " => "Не удалось запустить приложение",
 "Email saved" => "Email сохранен",
 "Invalid email" => "Неверный email",
 "Unable to delete group" => "Невозможно удалить группу",
-"Authentication error" => "Ошибка авторизации",
 "Unable to delete user" => "Невозможно удалить пользователя",
 "Language changed" => "Язык изменен",
 "Invalid request" => "Неверный запрос",
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index 4dbe31b9910..b2613290f91 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -1,11 +1,11 @@
 <?php $TRANSLATIONS = array(
+"Authentication error" => "සත්‍යාපන දෝෂයක්",
 "Group already exists" => "කණ්ඩායම දැනටමත් තිබේ",
 "Unable to add group" => "කාණඩයක් එක් කළ නොහැකි විය",
 "Could not enable app. " => "යෙදුම සක්‍රීය කළ නොහැකි විය.",
 "Email saved" => "වි-තැපෑල සුරකින ලදී",
 "Invalid email" => "අවලංගු වි-තැපෑල",
 "Unable to delete group" => "කණ්ඩායම මැකීමට නොහැක",
-"Authentication error" => "සත්‍යාපන දෝෂයක්",
 "Unable to delete user" => "පරිශීලකයා මැකීමට නොහැක",
 "Language changed" => "භාෂාව ාවනස් කිරීම",
 "Invalid request" => "අවලංගු අයදුම",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 6148f1476a2..162e4d3d014 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nie je možné nahrať zoznam z App Store",
+"Authentication error" => "Chyba pri autentifikácii",
 "Group already exists" => "Skupina už existuje",
 "Unable to add group" => "Nie je možné pridať skupinu",
 "Could not enable app. " => "Nie je možné zapnúť aplikáciu.",
 "Email saved" => "Email uložený",
 "Invalid email" => "Neplatný email",
 "Unable to delete group" => "Nie je možné odstrániť skupinu",
-"Authentication error" => "Chyba pri autentifikácii",
 "Unable to delete user" => "Nie je možné odstrániť používateľa",
 "Language changed" => "Jazyk zmenený",
 "Invalid request" => "Neplatná požiadavka",
@@ -48,6 +48,7 @@
 "New password" => "Nové heslo",
 "show" => "zobraziť",
 "Change password" => "Zmeniť heslo",
+"Display Name" => "Zobrazované meno",
 "Email" => "Email",
 "Your email address" => "Vaša emailová adresa",
 "Fill in an email address to enable password recovery" => "Vyplňte emailovú adresu pre aktivovanie obnovy hesla",
@@ -63,7 +64,6 @@
 "Default Storage" => "Predvolené úložisko",
 "Unlimited" => "Nelimitované",
 "Other" => "Iné",
-"Display Name" => "Zobrazované meno",
 "Group Admin" => "Správca skupiny",
 "Storage" => "Úložisko",
 "change display name" => "zmeniť zobrazované meno",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 1524f3c33da..8f4fb9435e8 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ni mogoče naložiti seznama iz App Store",
+"Authentication error" => "Napaka overitve",
 "Group already exists" => "Skupina že obstaja",
 "Unable to add group" => "Ni mogoče dodati skupine",
 "Could not enable app. " => "Programa ni mogoče omogočiti.",
 "Email saved" => "Elektronski naslov je shranjen",
 "Invalid email" => "Neveljaven elektronski naslov",
 "Unable to delete group" => "Ni mogoče izbrisati skupine",
-"Authentication error" => "Napaka overitve",
 "Unable to delete user" => "Ni mogoče izbrisati uporabnika",
 "Language changed" => "Jezik je bil spremenjen",
 "Invalid request" => "Neveljavna zahteva",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index e9c12e2ea0a..1b12a0178dd 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Грешка приликом учитавања списка из Складишта Програма",
+"Authentication error" => "Грешка при аутентификацији",
 "Group already exists" => "Група већ постоји",
 "Unable to add group" => "Не могу да додам групу",
 "Could not enable app. " => "Не могу да укључим програм",
 "Email saved" => "Е-порука сачувана",
 "Invalid email" => "Неисправна е-адреса",
 "Unable to delete group" => "Не могу да уклоним групу",
-"Authentication error" => "Грешка при аутентификацији",
 "Unable to delete user" => "Не могу да уклоним корисника",
 "Language changed" => "Језик је промењен",
 "Invalid request" => "Неисправан захтев",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 239948a0f40..fb8c7854e9b 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Kan inte ladda listan från App Store",
+"Authentication error" => "Autentiseringsfel",
 "Group already exists" => "Gruppen finns redan",
 "Unable to add group" => "Kan inte lägga till grupp",
 "Could not enable app. " => "Kunde inte aktivera appen.",
 "Email saved" => "E-post sparad",
 "Invalid email" => "Ogiltig e-post",
 "Unable to delete group" => "Kan inte radera grupp",
-"Authentication error" => "Autentiseringsfel",
 "Unable to delete user" => "Kan inte radera användare",
 "Language changed" => "Språk ändrades",
 "Invalid request" => "Ogiltig begäran",
@@ -48,6 +48,7 @@
 "New password" => "Nytt lösenord",
 "show" => "visa",
 "Change password" => "Ändra lösenord",
+"Display Name" => "Visat namn",
 "Email" => "E-post",
 "Your email address" => "Din e-postadress",
 "Fill in an email address to enable password recovery" => "Fyll i en e-postadress för att aktivera återställning av lösenord",
@@ -63,7 +64,6 @@
 "Default Storage" => "Förvald lagring",
 "Unlimited" => "Obegränsad",
 "Other" => "Annat",
-"Display Name" => "Visat namn",
 "Group Admin" => "Gruppadministratör",
 "Storage" => "Lagring",
 "change display name" => "ändra visat namn",
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index e383a297c4f..5e94df0dfb2 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "செயலி சேமிப்பிலிருந்து பட்டியலை ஏற்றமுடியாதுள்ளது",
+"Authentication error" => "அத்தாட்சிப்படுத்தலில் வழு",
 "Group already exists" => "குழு ஏற்கனவே உள்ளது",
 "Unable to add group" => "குழுவை சேர்க்க முடியாது",
 "Could not enable app. " => "செயலியை இயலுமைப்படுத்த முடியாது",
 "Email saved" => "மின்னஞ்சல் சேமிக்கப்பட்டது",
 "Invalid email" => "செல்லுபடியற்ற மின்னஞ்சல்",
 "Unable to delete group" => "குழுவை நீக்க முடியாது",
-"Authentication error" => "அத்தாட்சிப்படுத்தலில் வழு",
 "Unable to delete user" => "பயனாளரை நீக்க முடியாது",
 "Language changed" => "மொழி மாற்றப்பட்டது",
 "Invalid request" => "செல்லுபடியற்ற வேண்டுகோள்",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 9350b78297b..309dbc2657c 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "ไม่สามารถโหลดรายการจาก App Store ได้",
+"Authentication error" => "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน",
 "Group already exists" => "มีกลุ่มดังกล่าวอยู่ในระบบอยู่แล้ว",
 "Unable to add group" => "ไม่สามารถเพิ่มกลุ่มได้",
 "Could not enable app. " => "ไม่สามารถเปิดใช้งานแอปได้",
 "Email saved" => "อีเมลถูกบันทึกแล้ว",
 "Invalid email" => "อีเมลไม่ถูกต้อง",
 "Unable to delete group" => "ไม่สามารถลบกลุ่มได้",
-"Authentication error" => "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน",
 "Unable to delete user" => "ไม่สามารถลบผู้ใช้งานได้",
 "Language changed" => "เปลี่ยนภาษาเรียบร้อยแล้ว",
 "Invalid request" => "คำร้องขอไม่ถูกต้อง",
@@ -48,6 +48,7 @@
 "New password" => "รหัสผ่านใหม่",
 "show" => "แสดง",
 "Change password" => "เปลี่ยนรหัสผ่าน",
+"Display Name" => "ชื่อที่ต้องการแสดง",
 "Email" => "อีเมล์",
 "Your email address" => "ที่อยู่อีเมล์ของคุณ",
 "Fill in an email address to enable password recovery" => "กรอกที่อยู่อีเมล์ของคุณเพื่อเปิดให้มีการกู้คืนรหัสผ่านได้",
@@ -63,7 +64,6 @@
 "Default Storage" => "พื้นที่จำกัดข้อมูลเริ่มต้น",
 "Unlimited" => "ไม่จำกัดจำนวน",
 "Other" => "อื่นๆ",
-"Display Name" => "ชื่อที่ต้องการแสดง",
 "Group Admin" => "ผู้ดูแลกลุ่ม",
 "Storage" => "พื้นที่จัดเก็บข้อมูล",
 "change display name" => "เปลี่ยนชื่อที่ต้องการให้แสดง",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 89c8cf2829e..db55491612e 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "App Store'dan liste yüklenemiyor",
+"Authentication error" => "Eşleşme hata",
 "Group already exists" => "Grup zaten mevcut",
 "Unable to add group" => "Gruba eklenemiyor",
 "Could not enable app. " => "Uygulama devreye alınamadı",
 "Email saved" => "Eposta kaydedildi",
 "Invalid email" => "Geçersiz eposta",
 "Unable to delete group" => "Grup silinemiyor",
-"Authentication error" => "Eşleşme hata",
 "Unable to delete user" => "Kullanıcı silinemiyor",
 "Language changed" => "Dil değiştirildi",
 "Invalid request" => "Geçersiz istek",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index 035dbec3910..7186b2684eb 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -1,21 +1,28 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Не вдалося завантажити список з App Store",
+"Authentication error" => "Помилка автентифікації",
+"Unable to change display name" => "Не вдалося змінити зображене ім'я",
 "Group already exists" => "Група вже існує",
 "Unable to add group" => "Не вдалося додати групу",
 "Could not enable app. " => "Не вдалося активувати програму. ",
 "Email saved" => "Адресу збережено",
 "Invalid email" => "Невірна адреса",
 "Unable to delete group" => "Не вдалося видалити групу",
-"Authentication error" => "Помилка автентифікації",
 "Unable to delete user" => "Не вдалося видалити користувача",
 "Language changed" => "Мова змінена",
 "Invalid request" => "Помилковий запит",
 "Admins can't remove themself from the admin group" => "Адміністратор не може видалити себе з групи адмінів",
 "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...." => "Зачекайте, будь ласка...",
+"Updating...." => "Оновлюється...",
+"Error while updating app" => "Помилка при оновленні програми",
 "Error" => "Помилка",
+"Updated" => "Оновлено",
 "Saving..." => "Зберігаю...",
 "__language_name__" => "__language_name__",
 "Add your App" => "Додати свою програму",
@@ -42,6 +49,10 @@
 "New password" => "Новий пароль",
 "show" => "показати",
 "Change password" => "Змінити пароль",
+"Display Name" => "Показати Ім'я",
+"Your display name was changed" => "Ваше ім'я було змінене",
+"Unable to change your display name" => "Неможливо змінити ваше зображене ім'я",
+"Change display name" => "Змінити зображене ім'я",
 "Email" => "Ел.пошта",
 "Your email address" => "Ваша адреса електронної пошти",
 "Fill in an email address to enable password recovery" => "Введіть адресу електронної пошти для відновлення паролю",
@@ -51,6 +62,7 @@
 "Use this address to connect to your ownCloud in your file manager" => "Використовуйте цю адресу для під'єднання до вашого ownCloud у вашому файловому менеджері",
 "Version" => "Версія",
 "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=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud громадою</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">вихідний код</a> має ліцензію <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"Login Name" => "Ім'я Логіну",
 "Groups" => "Групи",
 "Create" => "Створити",
 "Default Storage" => "сховище за замовчуванням",
@@ -58,6 +70,8 @@
 "Other" => "Інше",
 "Group Admin" => "Адміністратор групи",
 "Storage" => "Сховище",
+"change display name" => "змінити зображене ім'я",
+"set new password" => "встановити новий пароль",
 "Default" => "За замовчуванням",
 "Delete" => "Видалити"
 );
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 3a133460a38..a7682e7ed0e 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Không thể tải danh sách ứng dụng từ App Store",
+"Authentication error" => "Lỗi xác thực",
 "Group already exists" => "Nhóm đã tồn tại",
 "Unable to add group" => "Không thể thêm nhóm",
 "Could not enable app. " => "không thể kích hoạt ứng dụng.",
 "Email saved" => "Lưu email",
 "Invalid email" => "Email không hợp lệ",
 "Unable to delete group" => "Không thể xóa nhóm",
-"Authentication error" => "Lỗi xác thực",
 "Unable to delete user" => "Không thể xóa người dùng",
 "Language changed" => "Ngôn ngữ đã được thay đổi",
 "Invalid request" => "Yêu cầu không hợp lệ",
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index 6a957518564..c7d73ae2ded 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "不能从App Store 中加载列表",
+"Authentication error" => "认证错误",
 "Group already exists" => "群组已存在",
 "Unable to add group" => "未能添加群组",
 "Could not enable app. " => "未能启用应用",
 "Email saved" => "Email 保存了",
 "Invalid email" => "非法Email",
 "Unable to delete group" => "未能删除群组",
-"Authentication error" => "认证错误",
 "Unable to delete user" => "未能删除用户",
 "Language changed" => "语言改变了",
 "Invalid request" => "非法请求",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 48f890fb0c9..40c571a8763 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "无法从应用商店载入列表",
+"Authentication error" => "认证错误",
 "Group already exists" => "已存在该组",
 "Unable to add group" => "无法添加组",
 "Could not enable app. " => "无法开启App",
 "Email saved" => "电子邮件已保存",
 "Invalid email" => "无效的电子邮件",
 "Unable to delete group" => "无法删除组",
-"Authentication error" => "认证错误",
 "Unable to delete user" => "无法删除用户",
 "Language changed" => "语言已修改",
 "Invalid request" => "非法请求",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index b540549524d..ecff21604f3 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "無法從 App Store 讀取清單",
+"Authentication error" => "認證錯誤",
 "Group already exists" => "群組已存在",
 "Unable to add group" => "群組增加失敗",
 "Could not enable app. " => "未能啟動此app",
 "Email saved" => "Email已儲存",
 "Invalid email" => "無效的email",
 "Unable to delete group" => "群組刪除錯誤",
-"Authentication error" => "認證錯誤",
 "Unable to delete user" => "使用者刪除錯誤",
 "Language changed" => "語言已變更",
 "Invalid request" => "無效請求",
@@ -48,6 +48,7 @@
 "New password" => "新密碼",
 "show" => "顯示",
 "Change password" => "變更密碼",
+"Display Name" => "顯示名稱",
 "Email" => "電子郵件",
 "Your email address" => "你的電子郵件信箱",
 "Fill in an email address to enable password recovery" => "請填入電子郵件信箱以便回復密碼",
@@ -63,7 +64,6 @@
 "Default Storage" => "預設儲存區",
 "Unlimited" => "無限制",
 "Other" => "其他",
-"Display Name" => "顯示名稱",
 "Group Admin" => "群組 管理員",
 "Storage" => "儲存區",
 "change display name" => "修改顯示名稱",
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 0097489743f..17be3396930 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -22,6 +22,35 @@ if (!$_['htaccessworking']) {
 <?php
 }
 
+// is WebDAV working ?
+if (!$_['isWebDavWorking']) {
+	?>
+<fieldset class="personalblock">
+	<legend><strong><?php echo $l->t('Setup Warning');?></strong></legend>
+
+	<span class="securitywarning">
+		<?php echo $l->t('Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken.'); ?>
+		<?php echo $l->t('Please double check the <a href=\'%s\'>installation guides</a>.', 'http://doc.owncloud.org/server/5.0/admin_manual/installation.html'); ?>
+	</span>
+
+</fieldset>
+<?php
+}
+
+// if module fileinfo available?
+if (!$_['has_fileinfo']) {
+	?>
+<fieldset class="personalblock">
+	<legend><strong><?php echo $l->t('Module \'fileinfo\' missing');?></strong></legend>
+
+		<span class="connectionwarning">
+		<?php echo $l->t('The PHP module \'fileinfo\' is missing. We strongly recommend to enable this module to get best results with mime-type detection.'); ?>
+	</span>
+
+</fieldset>
+<?php
+}
+
 // is locale working ?
 if (!$_['islocaleworking']) {
 	?>
@@ -29,7 +58,7 @@ if (!$_['islocaleworking']) {
 	<legend><strong><?php echo $l->t('Locale not working');?></strong></legend>
 
 		<span class="connectionwarning">
-		<?php echo $l->t('This ownCloud server can\'t set system locale to "en_US.UTF-8". 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 en_US.UTF-8.'); ?>
+		<?php echo $l->t('This ownCloud server can\'t set system locale to "en_US.UTF-8"/"en_US.UTF8". 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 en_US.UTF-8/en_US.UTF8.'); ?>
 	</span>
 
 </fieldset>
diff --git a/settings/templates/help.php b/settings/templates/help.php
index 7383fdcf56a..315cbfdb9a2 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -10,5 +10,6 @@
 	<?php } ?>
 	<a class="button newquestion" href="http://owncloud.com" target="_blank"><?php echo $l->t( 'Commercial Support' ); ?></a>
 </div>
-<br /><br />
-<iframe src="<?php echo($_['url']); ?>" width="100%" id="ifm" ></iframe>
\ No newline at end of file
+<div class="help-includes">
+	<iframe src="<?php echo($_['url']); ?>" class="help-iframe">abc</iframe>
+</div>
diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php
index 781c0f92c92..c74a16f509f 100644
--- a/tests/lib/files/storage/storage.php
+++ b/tests/lib/files/storage/storage.php
@@ -146,10 +146,19 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
 		$localFolder = $this->instance->getLocalFolder('/folder');
 
 		$this->assertTrue(is_dir($localFolder));
-		$this->assertTrue(file_exists($localFolder . '/lorem.txt'));
-		$this->assertEquals(file_get_contents($localFolder . '/lorem.txt'), file_get_contents($textFile));
-		$this->assertEquals(file_get_contents($localFolder . '/bar.txt'), 'asd');
-		$this->assertEquals(file_get_contents($localFolder . '/recursive/file.txt'), 'foo');
+
+		// test below require to use instance->getLocalFile because the physical storage might be different
+		$localFile = $this->instance->getLocalFile('/folder/lorem.txt');
+		$this->assertTrue(file_exists($localFile));
+		$this->assertEquals(file_get_contents($localFile), file_get_contents($textFile));
+
+		$localFile = $this->instance->getLocalFile('/folder/bar.txt');
+		$this->assertTrue(file_exists($localFile));
+		$this->assertEquals(file_get_contents($localFile), 'asd');
+
+		$localFile = $this->instance->getLocalFile('/folder/recursive/file.txt');
+		$this->assertTrue(file_exists($localFile));
+		$this->assertEquals(file_get_contents($localFile), 'foo');
 	}
 
 	public function testStat() {
diff --git a/tests/lib/public/contacts.php b/tests/lib/public/contacts.php
index 23994667a26..ce5d762226b 100644
--- a/tests/lib/public/contacts.php
+++ b/tests/lib/public/contacts.php
@@ -39,7 +39,7 @@ class Test_Contacts extends PHPUnit_Framework_TestCase
 
 	public function testEnabledAfterRegister() {
 		// create mock for the addressbook
-		$stub = $this->getMock("SimpleAddressBook", array('getKey'));
+		$stub = $this->getMockForAbstractClass("OCP\IAddressBook", array('getKey'));
 
 		// we expect getKey to be called twice:
 		// first time on register
@@ -65,7 +65,7 @@ class Test_Contacts extends PHPUnit_Framework_TestCase
 
 	public function testAddressBookEnumeration() {
 		// create mock for the addressbook
-		$stub = $this->getMock("SimpleAddressBook", array('getKey', 'getDisplayName'));
+		$stub = $this->getMockForAbstractClass("OCP\IAddressBook", array('getKey', 'getDisplayName'));
 
 		// setup return for method calls
 		$stub->expects($this->any())
@@ -85,8 +85,8 @@ class Test_Contacts extends PHPUnit_Framework_TestCase
 
 	public function testSearchInAddressBook() {
 		// create mock for the addressbook
-		$stub1 = $this->getMock("SimpleAddressBook1", array('getKey', 'getDisplayName', 'search'));
-		$stub2 = $this->getMock("SimpleAddressBook2", array('getKey', 'getDisplayName', 'search'));
+		$stub1 = $this->getMockForAbstractClass("OCP\IAddressBook", array('getKey', 'getDisplayName', 'search'));
+		$stub2 = $this->getMockForAbstractClass("OCP\IAddressBook", array('getKey', 'getDisplayName', 'search'));
 
 		$searchResult1 = array(
 			array('id' => 0, 'FN' => 'Frank Karlitschek', 'EMAIL' => 'a@b.c', 'GEO' => '37.386013;-122.082932'),