diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 0920bf62109d7adcb42bb8523a2f69b525d06caa..45fb17de94ae94875f3f94b916e04d82343d84ad 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -110,30 +110,35 @@ if (strpos($dir, '..') === false) {
 			|| (isset($_POST['resolution']) && $_POST['resolution']==='replace')
 		) {
 			// upload and overwrite file
-			if (is_uploaded_file($files['tmp_name'][$i]) and \OC\Files\Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
-				
-				// updated max file size after upload
-				$storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);
-				
-				$meta = \OC\Files\Filesystem::getFileInfo($target);
-				if ($meta === false) {
-					$error = $l->t('Upload failed. Could not get file info.');
+			try
+			{
+				if (is_uploaded_file($files['tmp_name'][$i]) and \OC\Files\Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
+
+					// updated max file size after upload
+					$storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);
+
+					$meta = \OC\Files\Filesystem::getFileInfo($target);
+					if ($meta === false) {
+						$error = $l->t('Upload failed. Could not get file info.');
+					} else {
+						$result[] = array('status' => 'success',
+							'mime' => $meta['mimetype'],
+							'mtime' => $meta['mtime'],
+							'size' => $meta['size'],
+							'id' => $meta['fileid'],
+							'name' => basename($target),
+							'originalname' => $files['tmp_name'][$i],
+							'uploadMaxFilesize' => $maxUploadFileSize,
+							'maxHumanFilesize' => $maxHumanFileSize,
+							'permissions' => $meta['permissions'],
+						);
+					}
+
 				} else {
-					$result[] = array('status' => 'success',
-						'mime' => $meta['mimetype'],
-						'mtime' => $meta['mtime'],
-						'size' => $meta['size'],
-						'id' => $meta['fileid'],
-						'name' => basename($target),
-						'originalname' => $files['tmp_name'][$i],
-						'uploadMaxFilesize' => $maxUploadFileSize,
-						'maxHumanFilesize' => $maxHumanFileSize,
-						'permissions' => $meta['permissions'],
-					);
+					$error = $l->t('Upload failed. Could not find uploaded file');
 				}
-				
-			} else {
-				$error = $l->t('Upload failed. Could not find uploaded file');
+			} catch(Exception $ex) {
+				$error = $ex->getMessage();
 			}
 			
 		} else {
@@ -164,5 +169,5 @@ if ($error === false) {
 	OCP\JSON::encodedPrint($result);
 	exit();
 } else {
-	OCP\JSON::error(array('data' => array_merge(array('message' => $error), $storageStats)));
+	OCP\JSON::error(array(array('data' => array_merge(array('message' => $error), $storageStats))));
 }
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index e26c1a89b789ebb2a8c318e3b7d98bd418592c9e..c4a231551b10b103056b736e23903cc4938a2ede 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -8,7 +8,7 @@
 .actions .button a { color: #555; }
 .actions .button a:hover, .actions .button a:active { color: #333; }
 
-#new, #trash {
+#new {
 	z-index: 1010;
 	float: left;
 	padding: 0 !important; /* override default control bar button padding */
@@ -16,8 +16,10 @@
 #trash {
 	margin-right: 12px;
 	float: right;
+	z-index: 1010;
+	padding: 10px;
 }
-#new>a, #trash>a {
+#new>a {
 	padding: 14px 10px;
 	position: relative;
 	top: 7px;
@@ -103,8 +105,6 @@ table th#headerDate, table td.date {
 	box-sizing: border-box;
 	position: relative;
 	min-width: 11em;
-	display: block;
-	height: 51px;
 }
 
 /* Multiselect bar */
@@ -159,8 +159,6 @@ table td.filename .nametext, .uploadtext, .modified { float:left; padding:.3em 0
 }
 .modified {
 	position: relative;
-	top: 11px;
-	left: 5px;
 }
 
 /* TODO fix usability bug (accidental file/folder selection) */
@@ -176,6 +174,9 @@ table td.filename .nametext {
 table td.filename .uploadtext { font-weight:normal; margin-left:.5em; }
 table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
 
+.ie8 input[type="checkbox"]{
+	padding: 0;
+}
 
 /* File checkboxes */
 #fileList tr td.filename>input[type="checkbox"]:first-child {
@@ -251,9 +252,7 @@ table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
 #fileList a.action.delete {
 	position: absolute;
 	right: 0;
-	top: 0;
-	margin: 0;
-	padding: 15px 14px 19px !important;
+	padding: 9px 14px 19px !important;
 }
 a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
 
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index f1ef485fc3d77eb99ea6e4a703daf9ba54f2bb00..c03e9037cecea8623897f12334cd6a71447e09de 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -345,7 +345,7 @@ $(document).ready(function() {
 				} else if (result[0].status !== 'success') {
 					//delete data.jqXHR;
 					data.textStatus = 'servererror';
-					data.errorThrown = result.data.message; // error message has been translated on server
+					data.errorThrown = result[0].data.message; // error message has been translated on server
 					var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
 					fu._trigger('fail', e, data);
 				}
@@ -523,8 +523,10 @@ $(document).ready(function() {
 						function(result){
 							if (result.status == 'success') {
 								var date=new Date();
-								FileList.addFile(name,0,date,false,hidden);
-								var tr=$('tr').filterAttr('data-file',name);
+								// TODO: ideally addFile should be able to receive
+								// all attributes and set them automatically,
+								// and also auto-load the preview
+								var tr = FileList.addFile(name,0,date,false,hidden);
 								tr.attr('data-size',result.data.size);
 								tr.attr('data-mime',result.data.mime);
 								tr.attr('data-id', result.data.id);
@@ -533,6 +535,7 @@ $(document).ready(function() {
 								lazyLoadPreview(path, result.data.mime, function(previewpath){
 									tr.find('td.filename').attr('style','background-image:url('+previewpath+')');
 								});
+								FileActions.display(tr.find('td.filename'));
 							} else {
 								OC.dialogs.alert(result.data.message, t('core', 'Error'));
 							}
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 37b6685884025f21244f07277110c3e3828b7de8..9e7a2364b1809ad88824182daecee4161d5aa643 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -703,7 +703,10 @@ function checkTrashStatus() {
 }
 
 function onClickBreadcrumb(e){
-	var $el = $(e.target).closest('.crumb');
-	e.preventDefault();
-	FileList.changeDirectory(decodeURIComponent($el.data('dir')));
+	var $el = $(e.target).closest('.crumb'),
+		$targetDir = $el.data('dir');
+	if ($targetDir !== undefined){
+		e.preventDefault();
+		FileList.changeDirectory(decodeURIComponent($targetDir));
+	}
 }
diff --git a/apps/files/l10n/ady.php b/apps/files/l10n/ady.php
new file mode 100644
index 0000000000000000000000000000000000000000..0157af093e92200cc7790497227e92e62d80165f
--- /dev/null
+++ b/apps/files/l10n/ady.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/en_GB.php b/apps/files/l10n/en_GB.php
index c747555e40be799f635d098e9e4268a973f8342b..96a4be20b5cce6291400723a976c6693df2a6cec 100644
--- a/apps/files/l10n/en_GB.php
+++ b/apps/files/l10n/en_GB.php
@@ -44,6 +44,8 @@ $TRANSLATIONS = array(
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.",
 "Your storage is full, files can not be updated or synced anymore!" => "Your storage is full, files can not be updated or synced anymore!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Your storage is almost full ({usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Encryption App is enabled but your keys are not initialised, please log-out and log-in again",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.",
 "Your download is being prepared. This might take some time if the files are big." => "Your download is being prepared. This might take some time if the files are big.",
 "Error moving file" => "Error moving file",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index bfed4b2227673ab67e3aeccc553e97dcd6f99ed2..b7091fe544db6dcce182a9b96df01c4ae31e0102 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -44,6 +44,8 @@ $TRANSLATIONS = array(
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
 "Your storage is full, files can not be updated or synced anymore!" => "Su almacenamiento está lleno, ¡no se pueden actualizar o sincronizar más!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Encryption App está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "La clave privada no es válida para Encryption App. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos encriptados.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos.",
 "Your download is being prepared. This might take some time if the files are big." => "Su descarga está siendo preparada. Esto puede tardar algún tiempo si los archivos son grandes.",
 "Error moving file" => "Error moviendo archivo",
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index cb637d849b3eabdc9b6a16eec773cb4b2749309c..d25b737037f76889371f7b344494c20432dba801 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
 "Upload failed. Could not find uploaded file" => "Üleslaadimine ebaõnnestus. Üleslaetud faili ei leitud",
 "Invalid directory." => "Vigane kaust.",
 "Files" => "Failid",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Ei saa üles laadida {filename}, kuna see on kataloog või selle suurus on 0 baiti",
 "Not enough space available" => "Pole piisavalt ruumi",
 "Upload cancelled." => "Üleslaadimine tühistati.",
 "Could not get result from server." => "Serverist ei saadud tulemusi",
@@ -43,6 +44,8 @@ $TRANSLATIONS = array(
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud.",
 "Your storage is full, files can not be updated or synced anymore!" => "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Su andmemaht on peaaegu täis ({usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Krüpteerimisrakend on lubatud, kuid võtmeid pole lähtestatud. Palun logi välja ning uuesti sisse.",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Vigane Krüpteerimisrakendi privaatvõti . Palun uuenda oma privaatse võtme parool oma personaasete seadete all taastamaks ligipääsu oma krüpteeritud failidele.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Krüpteering on keelatud, kuid sinu failid on endiselt krüpteeritud. Palun vaata oma personaalseid seadeid oma failide dekrüpteerimiseks.",
 "Your download is being prepared. This might take some time if the files are big." => "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. ",
 "Error moving file" => "Viga faili eemaldamisel",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 03505a2a26988aef322b7f0210b10705b3f5a1fa..ca1ed09ef3decc88cd1e54f9c1970adc7bcc21e5 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -44,6 +44,8 @@ $TRANSLATIONS = array(
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés.",
 "Your storage is full, files can not be updated or synced anymore!" => "Votre espage de stockage est plein, les fichiers ne peuvent plus être téléversés ou synchronisés !",
 "Your storage is almost full ({usedSpacePercent}%)" => "Votre espace de stockage est presque plein ({usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "L'application de chiffrement est activée mais vos clés ne sont pas initialisées, veuillez vous déconnecter et ensuite vous reconnecter.",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Votre clef privée pour l'application de chiffrement est invalide ! Veuillez mettre à jour le mot de passe de votre clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Le chiffrement était désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos Paramètres personnels pour déchiffrer vos fichiers.",
 "Your download is being prepared. This might take some time if the files are big." => "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux.",
 "Error moving file" => "Erreur lors du déplacement du fichier",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 65ad526523795934267b5ee1861ee36c2246cb51..5e2a752b97428a46e1aafdef666d0bd5eb9d854c 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -13,10 +13,14 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Er ontbreekt een tijdelijke map",
 "Failed to write to disk" => "Schrijven naar schijf mislukt",
 "Not enough storage available" => "Niet genoeg opslagruimte beschikbaar",
+"Upload failed. Could not get file info." => "Upload mislukt, Kon geen bestandsinfo krijgen.",
+"Upload failed. Could not find uploaded file" => "Upload mislukt. Kon ge-uploade bestand niet vinden",
 "Invalid directory." => "Ongeldige directory.",
 "Files" => "Bestanden",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Kan {filename} niet uploaden omdat het een map is of 0 bytes groot is",
 "Not enough space available" => "Niet genoeg ruimte beschikbaar",
 "Upload cancelled." => "Uploaden geannuleerd.",
+"Could not get result from server." => "Kon het resultaat van de server niet terugkrijgen.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
 "URL cannot be empty." => "URL kan niet leeg zijn.",
 "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ongeldige mapnaam. Gebruik van 'Gedeeld' is voorbehouden aan Owncloud zelf",
@@ -40,8 +44,11 @@ $TRANSLATIONS = array(
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan.",
 "Your storage is full, files can not be updated or synced anymore!" => "Uw opslagruimte zit vol, Bestanden kunnen niet meer worden ge-upload of gesynchroniseerd!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Ongeldige privésleutel voor crypto app. Werk het privésleutel wachtwoord bij in uw persoonlijke instellingen om opnieuw toegang te krijgen tot uw versleutelde bestanden.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Encryptie is uitgeschakeld maar uw bestanden zijn nog steeds versleuteld. Ga naar uw persoonlijke instellingen om uw bestanden te decoderen.",
 "Your download is being prepared. This might take some time if the files are big." => "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden.",
+"Error moving file" => "Fout bij verplaatsen bestand",
 "Name" => "Naam",
 "Size" => "Grootte",
 "Modified" => "Aangepast",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index f6d61fc9873e6d1d497587147f1f21643c11bd0e..342cab2bf4ea916ca75f353781275100adea1baa 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -13,10 +13,12 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Está a faltar a pasta temporária",
 "Failed to write to disk" => "Falhou a escrita no disco",
 "Not enough storage available" => "Não há espaço suficiente em disco",
+"Upload failed. Could not get file info." => "O carregamento falhou. Não foi possível obter a informação do ficheiro.",
 "Invalid directory." => "Directório Inválido",
 "Files" => "Ficheiros",
 "Not enough space available" => "Espaço em disco insuficiente!",
 "Upload cancelled." => "Envio cancelado.",
+"Could not get result from server." => "Não foi possível obter o resultado do servidor.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora.",
 "URL cannot be empty." => "O URL não pode estar vazio.",
 "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome da pasta inválido. Palavra 'Shared' é reservado pela ownCloud",
@@ -42,6 +44,7 @@ $TRANSLATIONS = array(
 "Your storage is almost full ({usedSpacePercent}%)" => "O seu espaço de armazenamento está quase cheiro ({usedSpacePercent}%)",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "A encriptação foi desactivada mas os seus ficheiros continuam encriptados.  Por favor consulte as suas definições pessoais para desencriptar os ficheiros.",
 "Your download is being prepared. This might take some time if the files are big." => "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes.",
+"Error moving file" => "Erro ao mover o ficheiro",
 "Name" => "Nome",
 "Size" => "Tamanho",
 "Modified" => "Modificado",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 208dcd4ea12d83ddd617cf390e88874e77396c76..32267ea2e71aca8d1b8343612b4c001217fd05c2 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -13,10 +13,14 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "En temporär mapp saknas",
 "Failed to write to disk" => "Misslyckades spara till disk",
 "Not enough storage available" => "Inte tillräckligt med lagringsutrymme tillgängligt",
+"Upload failed. Could not get file info." => "Uppladdning misslyckades. Gick inte att hämta filinformation.",
+"Upload failed. Could not find uploaded file" => "Uppladdning misslyckades. Kunde inte hitta den uppladdade filen",
 "Invalid directory." => "Felaktig mapp.",
 "Files" => "Filer",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Kan inte ladda upp {filename} eftersom den antingen är en mapp eller har 0 bytes.",
 "Not enough space available" => "Inte tillräckligt med utrymme tillgängligt",
 "Upload cancelled." => "Uppladdning avbruten.",
+"Could not get result from server." => "Gick inte att hämta resultat från server.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
 "URL cannot be empty." => "URL kan inte vara tom.",
 "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ogiltigt mappnamn. Användning av 'Shared' är reserverad av ownCloud",
@@ -40,8 +44,11 @@ $TRANSLATIONS = array(
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet.",
 "Your storage is full, files can not be updated or synced anymore!" => "Ditt lagringsutrymme är fullt, filer kan inte längre uppdateras eller synkroniseras!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Krypteringsprogrammet är aktiverat men dina nycklar är inte initierade. Vänligen logga ut och  in igen",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Ogiltig privat nyckel i krypteringsprogrammet. Vänligen uppdatera lösenordet till din privata nyckel under dina personliga inställningar för att återfå tillgång till dina krypterade filer.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Kryptering inaktiverades men dina filer är fortfarande krypterade. Vänligen gå till sidan för dina personliga inställningar för att dekryptera dina filer.",
 "Your download is being prepared. This might take some time if the files are big." => "Din nedladdning förbereds. Det kan ta tid om det är stora filer.",
+"Error moving file" => "Fel uppstod vid flyttning av fil",
 "Name" => "Namn",
 "Size" => "Storlek",
 "Modified" => "Ändrad",
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 5e7ad41b0f09ee231304b6d51ab01f611e6a126c..32a59f1e1a6a03e6b9687a6c73355ef18e6e05d8 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -1,4 +1,3 @@
-<!--[if IE 8]><style>input[type="checkbox"]{padding:0;}table td{position:static !important;}</style><![endif]-->
 <div id="controls">
 	<?php print_unescaped($_['breadcrumb']); ?>
 		<div class="actions creatable <?php if (!$_['isCreatable']):?>hidden<?php endif; ?> <?php if (isset($_['files']) and count($_['files'])==0):?>emptycontent<?php endif; ?>">
@@ -108,6 +107,7 @@
 </div>
 
 <!-- config hints for javascript -->
+<input type="hidden" name="filesApp" id="filesApp" value="1" />
 <input type="hidden" name="ajaxLoad" id="ajaxLoad" value="<?php p($_['ajaxLoad']); ?>" />
 <input type="hidden" name="allowZipDownload" id="allowZipDownload" value="<?php p($_['allowZipDownload']); ?>" />
 <input type="hidden" name="usedSpacePercent" id="usedSpacePercent" value="<?php p($_['usedSpacePercent']); ?>" />
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 0679da334dedbe907a3b683552bcae6a619230be..a6d2e44f34fa4766893a6bb0310f384fafc219b3 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -36,7 +36,7 @@ $totalsize = 0; ?>
 		<?php else: ?>
 			<a class="name" href="<?php p(rtrim($_['downloadURL'],'/').'/'.trim($directory,'/').'/'.$name); ?>">
 				<label class="filetext" title="" for="select-<?php p($file['fileid']); ?>"></label>
-				<span class="nametext"><?php print_unescaped(htmlspecialchars($file['basename']));?><span class='extension'><?php p($file['extension']);?></span>
+				<span class="nametext"><?php print_unescaped(htmlspecialchars($file['basename']));?><span class='extension'><?php p($file['extension']);?></span></span>
 			</a>
 		<?php endif; ?>
 			<?php if($file['type'] == 'dir'):?>
diff --git a/apps/files_encryption/files/error.php b/apps/files_encryption/files/error.php
index ac0c0269164fd9ecc6437c617e143d3e16d56e2d..61574edf5098dc05db9614f2cabecebd76673983 100644
--- a/apps/files_encryption/files/error.php
+++ b/apps/files_encryption/files/error.php
@@ -5,26 +5,39 @@ if (!isset($_)) { //also provide standalone error page
 
 	$l = OC_L10N::get('files_encryption');
 
-	if (isset($_GET['i']) && $_GET['i'] === '0') {
-		$errorMsg = $l->t('Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app.');
-		$init = '0';
+	if (isset($_GET['errorCode'])) {
+		$errorCode = $_GET['errorCode'];
+		switch ($errorCode) {
+			case \OCA\Encryption\Crypt::ENCRYPTION_NOT_INITIALIZED_ERROR:
+				$errorMsg = $l->t('Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app.');
+				break;
+			case \OCA\Encryption\Crypt::ENCRYPTION_PRIVATE_KEY_NOT_VALID_ERROR:
+				$errorMsg = $l->t('Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.');
+				break;
+			case \OCA\Encryption\Crypt::ENCRYPTION_NO_SHARE_KEY_FOUND:
+				$errorMsg = $l->t('Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you.');
+				break;
+			default:
+				$errorMsg = $l->t("Unknown error please check your system settings or contact your administrator");
+				break;
+		}
 	} else {
-		$errorMsg = $l->t('Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.');
-		$init = '1';
+		$errorCode = \OCA\Encryption\Crypt::ENCRYPTION_UNKNOWN_ERROR;
+		$errorMsg = $l->t("Unknown error please check your system settings or contact your administrator");
 	}
 
 	if (isset($_GET['p']) && $_GET['p'] === '1') {
-		header('HTTP/1.0 404 ' . $errorMsg);
+		header('HTTP/1.0 403 ' . $errorMsg);
 	}
 
 // check if ajax request
 	if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {
 		\OCP\JSON::error(array('data' => array('message' => $errorMsg)));
 	} else {
-		header('HTTP/1.0 404 ' . $errorMsg);
+		header('HTTP/1.0 403 ' . $errorMsg);
 		$tmpl = new OC_Template('files_encryption', 'invalid_private_key', 'guest');
 		$tmpl->assign('message', $errorMsg);
-		$tmpl->assign('init', $init);
+		$tmpl->assign('errorCode', $errorCode);
 		$tmpl->printPage();
 	}
 
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 2df860a8e5772d49526e3bf8ac32f13d0c1b3ee3..d9a76becf25cfbc7527b8830e01438cfd4c4d706 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -92,8 +92,6 @@ class Hooks {
 			}
 
 			// Encrypt existing user files:
-			// This serves to upgrade old versions of the encryption
-			// app (see appinfo/spec.txt)
 			if (
 				$util->encryptAll('/' . $params['uid'] . '/' . 'files', $session->getLegacyKey(), $params['password'])
 			) {
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
index 93a715d34171ed117ef77e65525535baa3bf03a7..99548cb1caca6243c3347383dc34379a09f81568 100644
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@@ -8,20 +8,24 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
 "Private key password successfully updated." => "Passwort des privaten Schlüssels erfolgreich aktualisiert",
 "Could not update the private key password. Maybe the old password was not correct." => "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Eventuell war das alte Passwort falsch.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuche Dich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Dein privater Schlüssel ist ungültig. Möglicher Weise wurde von außerhalb Dein Passwort geändert (z.B. in deinem gemeinsamen Verzeichnis). Du kannst das Passwort deines privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an deine Dateien zu gelangen.",
 "Missing requirements." => "Fehlende Vorraussetzungen",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stelle sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
 "Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
 "Saving..." => "Speichern...",
+"Go directly to your " => "Direkt wechseln zu Deinem",
 "personal settings" => "Private Einstellungen",
 "Encryption" => "Verschlüsselung",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Wiederherstellungsschlüssel aktivieren (ermöglicht das Wiederherstellen von Dateien, falls das Passwort vergessen wurde):",
 "Recovery key password" => "Wiederherstellungsschlüssel-Passwort",
+"Repeat Recovery key password" => "Schlüssel-Passwort zur Wiederherstellung wiederholen",
 "Enabled" => "Aktiviert",
 "Disabled" => "Deaktiviert",
 "Change recovery key password:" => "Wiederherstellungsschlüssel-Passwort ändern:",
 "Old Recovery key password" => "Altes Wiederherstellungsschlüssel-Passwort",
 "New Recovery key password" => "Neues Wiederherstellungsschlüssel-Passwort",
+"Repeat New Recovery key password" => "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen",
 "Change Password" => "Passwort ändern",
 "Your private key password no longer match your log-in password:" => "Ihr Passwort für ihren privaten Schlüssel stimmt nicht mehr mit ihrem Loginpasswort überein.",
 "Set your old private key password to your current log-in password." => "Setzen Sie ihr altes Passwort für ihren privaten Schlüssel auf ihr aktuelles Login-Passwort",
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index 79fdbe995e985cc3638d14580026878446747e14..9d33d2100d2892963da99f8c8671736a56c838a5 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -8,20 +8,24 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
 "Private key password successfully updated." => "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
 "Could not update the private key password. Maybe the old password was not correct." => "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuchen Sie sich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde von außerhalb Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen.",
 "Missing requirements." => "Fehlende Voraussetzungen",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
 "Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
 "Saving..." => "Speichern...",
+"Go directly to your " => "Direkt wechseln zu Ihrem",
 "personal settings" => "Persönliche Einstellungen",
 "Encryption" => "Verschlüsselung",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).",
 "Recovery key password" => "Wiederherstellungschlüsselpasswort",
+"Repeat Recovery key password" => "Schlüssel-Passwort zur Wiederherstellung wiederholen",
 "Enabled" => "Aktiviert",
 "Disabled" => "Deaktiviert",
 "Change recovery key password:" => "Wiederherstellungsschlüsselpasswort ändern",
 "Old Recovery key password" => "Altes Wiederherstellungsschlüsselpasswort",
 "New Recovery key password" => "Neues Wiederherstellungsschlüsselpasswort ",
+"Repeat New Recovery key password" => "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen",
 "Change Password" => "Passwort ändern",
 "Your private key password no longer match your log-in password:" => "Das Privatschlüsselpasswort darf nicht länger mit den Login-Passwort übereinstimmen.",
 "Set your old private key password to your current log-in password." => "Setzen Sie Ihr altes Privatschlüsselpasswort auf Ihr aktuelles LogIn-Passwort.",
diff --git a/apps/files_encryption/l10n/en_GB.php b/apps/files_encryption/l10n/en_GB.php
index d2bfdfa9ea46ccda18e928b3cf18ca44bf91dcc8..53eef77eb5482efdd9a965a10f51d57daef67d97 100644
--- a/apps/files_encryption/l10n/en_GB.php
+++ b/apps/files_encryption/l10n/en_GB.php
@@ -8,22 +8,26 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "Could not change the password. Maybe the old password was incorrect.",
 "Private key password successfully updated." => "Private key password updated successfully.",
 "Could not update the private key password. Maybe the old password was not correct." => "Could not update the private key password. Maybe the old password was not correct.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Encryption app not initialised! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialise the encryption app.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.",
 "Missing requirements." => "Missing requirements.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled.",
 "Following users are not set up for encryption:" => "Following users are not set up for encryption:",
 "Saving..." => "Saving...",
+"Go directly to your " => "Go directly to your ",
 "personal settings" => "personal settings",
 "Encryption" => "Encryption",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Enable recovery key (allow to recover users files in case of password loss):",
 "Recovery key password" => "Recovery key password",
+"Repeat Recovery key password" => "Repeat recovery key password",
 "Enabled" => "Enabled",
 "Disabled" => "Disabled",
 "Change recovery key password:" => "Change recovery key password:",
-"Old Recovery key password" => "Old Recovery key password",
-"New Recovery key password" => "New Recovery key password",
+"Old Recovery key password" => "Old recovery key password",
+"New Recovery key password" => "New recovery key password",
+"Repeat New Recovery key password" => "Repeat new recovery key password",
 "Change Password" => "Change Password",
-"Your private key password no longer match your log-in password:" => "Your private key password no longer match your login password:",
+"Your private key password no longer match your log-in password:" => "Your private key password no longer matches your login password:",
 "Set your old private key password to your current log-in password." => "Set your old private key password to your current login password.",
 " If you don't remember your old password you can ask your administrator to recover your files." => " If you don't remember your old password you can ask your administrator to recover your files.",
 "Old log-in password" => "Old login password",
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index b302795f934acf8dac7ceb01dae44e3f5cb77ee5..2e3c7c5816301899d7dd67e20e8b3af4a6daa9e5 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -8,20 +8,24 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
 "Private key password successfully updated." => "Contraseña de clave privada actualizada con éxito.",
 "Could not update the private key password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "¡Encryption App no está inicializada!. Quizás la aplicación fue reiniciada durante tu sesión. Por favor, cierra la sesión y vuelva a iniciarla para intentar inicializar la Encryption App.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. Puede actualizar su clave privada en sus opciones personales para recuperar el acceso a sus ficheros.",
 "Missing requirements." => "Requisitos incompletos.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada.",
 "Following users are not set up for encryption:" => "Los siguientes usuarios no han sido configurados para el cifrado:",
 "Saving..." => "Guardando...",
+"Go directly to your " => "Ir directamente a su",
 "personal settings" => "opciones personales",
 "Encryption" => "Cifrado",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar la clave de recuperación (permite recuperar los ficheros del usuario en caso de pérdida de la contraseña);",
 "Recovery key password" => "Contraseña de clave de recuperación",
+"Repeat Recovery key password" => "Repetir contraseña de clave de recuperación",
 "Enabled" => "Habilitar",
 "Disabled" => "Deshabilitado",
 "Change recovery key password:" => "Cambiar la contraseña de la clave de recuperación",
 "Old Recovery key password" => "Antigua clave de recuperación",
 "New Recovery key password" => "Nueva clave de recuperación",
+"Repeat New Recovery key password" => "Repetir nueva contraseña de clave de recuperación",
 "Change Password" => "Cambiar contraseña",
 "Your private key password no longer match your log-in password:" => "Su contraseña de clave privada ya no coincide con su contraseña de acceso:",
 "Set your old private key password to your current log-in password." => "Establecer la contraseña de su antigua clave privada a su contraseña actual de acceso.",
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index 0c9234d3a51fe21bca67e94e88741ee011a3a67f..c49e4e9e5a50697390a23ae5891dca9a80a868eb 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -8,20 +8,24 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.",
 "Private key password successfully updated." => "Privaatse võtme parool edukalt uuendatud.",
 "Could not update the private key password. Maybe the old password was not correct." => "Ei suutnud uuendada privaatse võtme parooli. Võib-olla polnud vana parool õige.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Krüpteerimise rakend pole käivitatud. Võib-olla krüpteerimise rakend taaskäivitati sinu sessiooni kestel. Palun proovi logida välja ning uuesti sisse käivitamaks krüpteerimise rakendit.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sinu privaatne võti pole toimiv! Tõenäoliselt on sinu parool muutunud väljaspool ownCloud süsteemi (näiteks ettevõtte keskhaldus). Sa saad uuendada oma privaatse võtme parooli seadete all taastamaks ligipääsu oma krüpteeritud failidele.",
 "Missing requirements." => "Nõutavad on puudu.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Palun veendu, et on paigaldatud PHP 5.3.3 või uuem ning PHP OpenSSL laiendus on lubatud ning seadistatud korrektselt. Hetkel krüpteerimise rakendus on peatatud.",
 "Following users are not set up for encryption:" => "Järgmised kasutajad pole seadistatud krüpteeringuks:",
 "Saving..." => "Salvestamine...",
+"Go directly to your " => "Liigu otse oma",
 "personal settings" => "isiklikes seadetes",
 "Encryption" => "Krüpteerimine",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Luba taastevõti (võimada kasutaja failide taastamine parooli kaotuse puhul):",
 "Recovery key password" => "Taastevõtme parool",
+"Repeat Recovery key password" => "Korda taastevõtme parooli",
 "Enabled" => "Sisse lülitatud",
 "Disabled" => "Väljalülitatud",
 "Change recovery key password:" => "Muuda taastevõtme parooli:",
 "Old Recovery key password" => "Vana taastevõtme parool",
 "New Recovery key password" => "Uus taastevõtme parool",
+"Repeat New Recovery key password" => "Korda uut taastevõtme parooli",
 "Change Password" => "Muuda parooli",
 "Your private key password no longer match your log-in password:" => "Sinu privaatse võtme parool ei ühti enam sinu sisselogimise parooliga:",
 "Set your old private key password to your current log-in password." => "Pane oma vana privaatvõtme parooliks oma praegune sisselogimise parool.",
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index b222aa10e4bcd66d60c0a8876ef00d2ac072fb7e..afce2ccfd3574cb3f5c6e2c5ae6be155d29e9e8a 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -8,20 +8,24 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect.",
 "Private key password successfully updated." => "Mot de passe de la clé privé mis à jour avec succès.",
 "Could not update the private key password. Maybe the old password was not correct." => "Impossible de mettre à jour le mot de passe de la clé privé. Peut-être que l'ancien mot de passe n'était pas correcte.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "L'application de chiffrement n'est pas initialisée ! Peut-être que cette application a été réactivée pendant votre session. Veuillez essayer de vous déconnecter et ensuite de vous reconnecter pour initialiser l'application de chiffrement.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Votre clé de sécurité privée n'est pas valide! Il est probable que votre mot de passe ait été changé sans passer par le système ownCloud (par éxemple: le serveur de votre entreprise). Ain d'avoir à nouveau accès à vos fichiers cryptés, vous pouvez mettre à jour votre clé de sécurité privée dans les paramètres personnels de votre compte.",
 "Missing requirements." => "Système minimum requis non respecté.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Veuillez vous assurer qu'une version de PHP 5.3.3 ou supérieure est installée et qu'OpenSSL et son extension PHP sont activés et configurés correctement. En attendant, l'application de chiffrement été désactivée.",
 "Following users are not set up for encryption:" => "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :",
 "Saving..." => "Enregistrement...",
+"Go directly to your " => "Allez directement à votre",
 "personal settings" => "paramètres personnel",
 "Encryption" => "Chiffrement",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe).",
 "Recovery key password" => "Mot de passe de la clef de récupération",
+"Repeat Recovery key password" => "Répétez le mot de passe de la clé de récupération",
 "Enabled" => "Activer",
 "Disabled" => "Désactiver",
 "Change recovery key password:" => "Modifier le mot de passe de la clef de récupération :",
 "Old Recovery key password" => "Ancien mot de passe de la clef de récupération",
 "New Recovery key password" => "Nouveau mot de passe de la clef de récupération",
+"Repeat New Recovery key password" => "Répétez le nouveau mot de passe de la clé de récupération",
 "Change Password" => "Changer de mot de passe",
 "Your private key password no longer match your log-in password:" => "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion :",
 "Set your old private key password to your current log-in password." => "Configurez le mot de passe de votre ancienne clef privée avec votre mot de passe courant de connexion. ",
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
index a6ffe10d57d57632a6779e775b258a8eedbafea6..5a1d8ec750dc1b5c89ee1ce332dcee6bf3f24abd 100644
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@@ -8,20 +8,24 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o  correcto.",
 "Private key password successfully updated." => "A chave privada foi actualizada correctamente.",
 "Could not update the private key password. Maybe the old password was not correct." => "Non foi posíbel actualizar o contrasinal da chave privada. É probábel que o contrasinal antigo non sexa correcto.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Non se iniciou o aplicativo de cifrado! Quizais volva a activarse durante a sesión. Tente pechar a sesión e volver iniciala que tamén se inicie o aplicativo de cifrado.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior (p.ex. o seu directorio corporativo). Vostede pode actualizar o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros",
 "Missing requirements." => "Non se cumpren os requisitos.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Asegúrese de que está instalado o PHP 5.3.3 ou posterior e de o OpenSSL xunto coa extensión PHP estean activados e configurados correctamente. Polo de agora foi desactivado o aplicativo de cifrado.",
 "Following users are not set up for encryption:" => "Os seguintes usuarios non teñen configuración para o cifrado:",
 "Saving..." => "Gardando...",
+"Go directly to your " => "Vaia directamente ao seu",
 "personal settings" => "axustes persoais",
 "Encryption" => "Cifrado",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Activar a chave de recuperación (permitirá recuperar os ficheiros dos usuarios no caso de perda do contrasinal):",
 "Recovery key password" => "Contrasinal da chave de recuperación",
+"Repeat Recovery key password" => "Repita o contrasinal da chave da recuperación",
 "Enabled" => "Activado",
 "Disabled" => "Desactivado",
 "Change recovery key password:" => "Cambiar o contrasinal da chave de la recuperación:",
 "Old Recovery key password" => "Antigo contrasinal da chave de recuperación",
 "New Recovery key password" => "Novo contrasinal da chave de recuperación",
+"Repeat New Recovery key password" => "Repita o novo contrasinal da chave da recuperación",
 "Change Password" => "Cambiar o contrasinal",
 "Your private key password no longer match your log-in password:" => "O seu contrasinal da chave privada non coincide co seu contrasinal de acceso.",
 "Set your old private key password to your current log-in password." => "Estabeleza o seu contrasinal antigo da chave de recuperación ao seu contrasinal de acceso actual",
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index f45dbe7c734c7f934f95282db3e80a4f6f7dad54..c93afa15729c815115a51debeaac2b7a9f580711 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -13,15 +13,18 @@ $TRANSLATIONS = array(
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata.",
 "Following users are not set up for encryption:" => "I seguenti utenti non sono configurati per la cifratura:",
 "Saving..." => "Salvataggio in corso...",
+"Go directly to your " => "Passa direttamente a",
 "personal settings" => "impostazioni personali",
 "Encryption" => "Cifratura",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Abilita la chiave di recupero (permette di recuperare i file utenti in caso di perdita della password):",
 "Recovery key password" => "Password della chiave di recupero",
+"Repeat Recovery key password" => "Ripeti la password della chiave di recupero",
 "Enabled" => "Abilitata",
 "Disabled" => "Disabilitata",
 "Change recovery key password:" => "Cambia la password della chiave di recupero:",
 "Old Recovery key password" => "Vecchia password della chiave di recupero",
 "New Recovery key password" => "Nuova password della chiave di recupero",
+"Repeat New Recovery key password" => "Ripeti la nuova password della chiave di recupero",
 "Change Password" => "Modifica password",
 "Your private key password no longer match your log-in password:" => "La password della chiave privata non corrisponde più alla password di accesso:",
 "Set your old private key password to your current log-in password." => "Imposta la vecchia password della chiave privata sull'attuale password di accesso.",
diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php
index 381c03f7e113d884501b3589fbfc8efede550d9d..ae57cb1c561839722950f4283394146df01bc5dc 100644
--- a/apps/files_encryption/l10n/lt_LT.php
+++ b/apps/files_encryption/l10n/lt_LT.php
@@ -8,20 +8,24 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas senasis.",
 "Private key password successfully updated." => "Privataus rakto slaptažodis buvo sėkmingai atnaujintas.",
 "Could not update the private key password. Maybe the old password was not correct." => "Nepavyko atnaujinti privataus rakto slaptažodžio. Gali būti, kad buvo neteisingai suvestas senasis.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Šifravimo programa nepaleista! Galbūt šifravimo programa buvo įjungta dar kartą Jūsų sesijos metu. Prašome atsijungti ir vėl prisijungti, kad paleisti šifravimo programą.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Jūsų privatus raktas yra netinkamas! Panašu, kad Jūsų slaptažodis buvo pakeistas išorėje ownCloud sistemos (pvz. Jūsų organizacijos kataloge). Galite atnaujinti savo privataus rakto slaptažodį savo asmeniniuose nustatymuose, kad atkurti prieigą prie savo šifruotų failų.",
 "Missing requirements." => "Trūkstami laukai.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Prašome įsitikinti, kad PHP 5.3.3 ar naujesnė yra įdiegta ir kad OpenSSL kartu su PHP plėtiniu yra šjungti ir teisingai sukonfigūruoti. Kol kas šifravimo programa bus išjungta.",
 "Following users are not set up for encryption:" => "Sekantys naudotojai nenustatyti šifravimui:",
 "Saving..." => "Saugoma...",
+"Go directly to your " => "Eiti tiesiai į Jūsų",
 "personal settings" => "asmeniniai nustatymai",
 "Encryption" => "Šifravimas",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Įjunkite atkūrimo raktą, (leisti atkurti naudotojų failus praradus slaptažodį):",
 "Recovery key password" => "Atkūrimo rakto slaptažodis",
+"Repeat Recovery key password" => "Pakartokite atkūrimo rakto slaptažodį",
 "Enabled" => "Įjungta",
 "Disabled" => "Išjungta",
 "Change recovery key password:" => "Pakeisti atkūrimo rakto slaptažodį:",
 "Old Recovery key password" => "Senas atkūrimo rakto slaptažodis",
 "New Recovery key password" => "Naujas atkūrimo rakto slaptažodis",
+"Repeat New Recovery key password" => "Pakartokite naują atkūrimo rakto slaptažodį",
 "Change Password" => "Pakeisti slaptažodį",
 "Your private key password no longer match your log-in password:" => "Privatus rakto slaptažodis daugiau neatitinka Jūsų prisijungimo slaptažodžio:",
 "Set your old private key password to your current log-in password." => "Nustatyti Jūsų privataus rakto slaptažodį į Jūsų dabartinį prisijungimo.",
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index 511120856a0f175bbb0b3068718c2010b538160b..86d56e40315bba7a78dbf25eb4ea46fd442ab924 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -8,20 +8,24 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.",
 "Private key password successfully updated." => "Privésleutel succesvol bijgewerkt.",
 "Could not update the private key password. Maybe the old password was not correct." => "Kon het wachtwoord van de privésleutel niet wijzigen. Misschien was het oude wachtwoord onjuist.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Crypto app niet geïnitialiseerd. Misschien werd de crypto app geheractiveerd tijdens de sessie. Log uit en log daarna opnieuw in om de crypto app te initialiseren.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Uw privésleutel is niet geldig! Misschien was uw wachtwoord van buitenaf gewijzigd. U kunt het wachtwoord van uw privésleutel aanpassen in uw persoonlijke instellingen om toegang tot uw versleutelde bestanden te vergaren.",
 "Missing requirements." => "Missende benodigdheden.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Wees er zeker van dat PHP5.3.3 of nieuwer is geïstalleerd en dat de OpenSSL PHP extensie is ingeschakeld en correct geconfigureerd. De versleutel-app is voorlopig uitgeschakeld.",
 "Following users are not set up for encryption:" => "De volgende gebruikers hebben geen configuratie voor encryptie:",
 "Saving..." => "Opslaan",
+"Go directly to your " => "Ga meteen naar uw",
 "personal settings" => "persoonlijke instellingen",
 "Encryption" => "Versleuteling",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Activeren herstelsleutel (maakt het mogelijk om gebruikersbestanden terug te halen in geval van verlies van het wachtwoord):",
 "Recovery key password" => "Wachtwoord herstelsleulel",
+"Repeat Recovery key password" => "Herhaal het herstelsleutel wachtwoord",
 "Enabled" => "Geactiveerd",
 "Disabled" => "Gedeactiveerd",
 "Change recovery key password:" => "Wijzig wachtwoord herstelsleutel:",
 "Old Recovery key password" => "Oude wachtwoord herstelsleutel",
 "New Recovery key password" => "Nieuwe wachtwoord herstelsleutel",
+"Repeat New Recovery key password" => "Herhaal het nieuwe herstelsleutel wachtwoord",
 "Change Password" => "Wijzigen wachtwoord",
 "Your private key password no longer match your log-in password:" => "Het wachtwoord van uw privésleutel komt niet meer overeen met uw inlogwachtwoord:",
 "Set your old private key password to your current log-in password." => "Stel het wachtwoord van uw oude privésleutel in op uw huidige inlogwachtwoord.",
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index 4eb1ca00dda4cbe4df942deef77900bedfbe91af..b448aaef1481e60b61cdc2a374ff8d172a4eeb7a 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -8,20 +8,24 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "Nie można zmienić hasła. Może stare hasło nie było poprawne.",
 "Private key password successfully updated." => "Pomyślnie zaktualizowano hasło klucza prywatnego.",
 "Could not update the private key password. Maybe the old password was not correct." => "Nie można zmienić prywatnego hasła. Może stare hasło nie było poprawne.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Szyfrowanie aplikacja nie została zainicjowane! Może szyfrowanie aplikacji zostało ponownie włączone podczas tej sesji. Spróbuj się wylogować i zalogować ponownie aby zainicjować szyfrowanie aplikacji.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Klucz prywatny nie jest ważny! Prawdopodobnie Twoje hasło zostało zmienione poza systemem ownCloud (np. w katalogu firmy). Aby odzyskać dostęp do zaszyfrowanych plików można zaktualizować hasło klucza prywatnego w ustawieniach osobistych.",
 "Missing requirements." => "Brak wymagań.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Proszę upewnić się, że PHP 5.3.3 lub nowszy jest zainstalowany i że OpenSSL oraz rozszerzenie PHP jest włączone i poprawnie skonfigurowane. Obecnie szyfrowanie aplikacji zostało wyłączone.",
 "Following users are not set up for encryption:" => "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:",
 "Saving..." => "Zapisywanie...",
+"Go directly to your " => "Przejdź bezpośrednio do",
 "personal settings" => "Ustawienia osobiste",
 "Encryption" => "Szyfrowanie",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Włączhasło klucza odzyskiwania (pozwala odzyskać pliki użytkowników w przypadku utraty hasła):",
 "Recovery key password" => "Hasło klucza odzyskiwania",
+"Repeat Recovery key password" => "Powtórz hasło klucza odzyskiwania",
 "Enabled" => "Włączone",
 "Disabled" => "Wyłączone",
 "Change recovery key password:" => "Zmień hasło klucza odzyskiwania",
 "Old Recovery key password" => "Stare hasło klucza odzyskiwania",
 "New Recovery key password" => "Nowe hasło klucza odzyskiwania",
+"Repeat New Recovery key password" => "Powtórz nowe hasło klucza odzyskiwania",
 "Change Password" => "Zmień hasło",
 "Your private key password no longer match your log-in password:" => "Hasło klucza prywatnego nie pasuje do  hasła logowania:",
 "Set your old private key password to your current log-in password." => "Podaj swoje stare prywatne hasło aby ustawić nowe",
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index 8e9432dacf684f511b9a2bb3ac74d1401ab505fe..c6abb1952d25a41d8bb25a7a8debc8344a725274 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -8,20 +8,24 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "Não foi possível alterar a senha. Talvez a senha antiga não estava correta.",
 "Private key password successfully updated." => "Senha de chave privada atualizada com sucesso.",
 "Could not update the private key password. Maybe the old password was not correct." => "Não foi possível atualizar a senha de chave privada. Talvez a senha antiga esteja incorreta.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Aplicativo de criptografia não foi inicializado! Talvez o aplicativo de criptografia tenha sido reativado durante essa sessão. Por favor, tente fazer logoff e login novamente para inicializar o aplicativo de criptografia.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sua chave privada não é válida! Provavelmente sua senha foi alterada fora do sistema ownCloud (por exemplo, seu diretório corporativo). Você pode atualizar sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.",
 "Missing requirements." => "Requisitos não encontrados.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado.",
 "Following users are not set up for encryption:" => "Seguintes usuários não estão configurados para criptografia:",
 "Saving..." => "Salvando...",
+"Go directly to your " => "Ir diretamente para o seu",
 "personal settings" => "configurações pessoais.",
 "Encryption" => "Criptografia",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar chave de recuperação (permite recuperar arquivos de usuários em caso de perda de senha):",
 "Recovery key password" => "Senha da chave de recuperação",
+"Repeat Recovery key password" => "Repita Recuperação de senha da chave",
 "Enabled" => "Habilitado",
 "Disabled" => "Desabilitado",
 "Change recovery key password:" => "Mudar a senha da chave de recuperação:",
 "Old Recovery key password" => "Senha antiga da chave de recuperação",
 "New Recovery key password" => "Nova senha da chave de recuperação",
+"Repeat New Recovery key password" => "Repita Nova senha da chave de recuperação",
 "Change Password" => "Trocar Senha",
 "Your private key password no longer match your log-in password:" => "Sua senha de chave privada não coincide mais com sua senha de login:",
 "Set your old private key password to your current log-in password." => "Configure sua antiga senha de chave privada para sua atual senha de login.",
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index 53335ab7297e70e608593396f0a6899ca4cb1293..788e102dd67c2e80d595e4afe941a4c5f902f98d 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -9,6 +9,7 @@ $TRANSLATIONS = array(
 "Could not update the private key password. Maybe the old password was not correct." => "Não foi possível alterar a chave. Possivelmente a password antiga não está correcta.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Chave privada não é válida! Provavelmente senha foi alterada fora do sistema ownCloud (exemplo, o diretório corporativo). Pode atualizar password da chave privada em configurações personalizadas para recuperar o acesso aos seus arquivos encriptados.",
 "Missing requirements." => "Faltam alguns requisitos.",
+"Following users are not set up for encryption:" => "Os utilizadores seguintes não estão marcados para cifragem:",
 "Saving..." => "A guardar...",
 "personal settings" => "configurações personalizadas ",
 "Encryption" => "Encriptação",
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index d425111cf03b6bdf0546662325b445899c64e7a0..f806c3cc3e633d549334cf772aeb20d7375a7d0e 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -6,29 +6,33 @@ $TRANSLATIONS = array(
 "Could not disable recovery key. Please check your recovery key password!" => "Kunde inte inaktivera återställningsnyckeln. Vänligen kontrollera ditt lösenord för återställningsnyckeln!",
 "Password successfully changed." => "Ändringen av lösenordet lyckades.",
 "Could not change the password. Maybe the old password was not correct." => "Kunde inte ändra lösenordet. Kanske det gamla lösenordet inte var rätt.",
-"Private key password successfully updated." => "Den privata lösenordsnyckeln uppdaterades utan problem.",
-"Could not update the private key password. Maybe the old password was not correct." => "Kunde inte uppdatera den privata lösenordsnyckeln. Kanske var det gamla lösenordet fel.",
-"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din privata lösenordsnyckel är inte giltig! Troligen har ditt lösenord ändrats utanför ownCloud (t.ex. i företagets katalogtjänst). Du kan uppdatera den privata lösenordsnyckeln under dina personliga inställningar för att återfå tillgång till dina filer.",
+"Private key password successfully updated." => "Den privata nyckelns lösenord uppdaterades utan problem.",
+"Could not update the private key password. Maybe the old password was not correct." => "Kunde inte uppdatera lösenordet för den privata nyckeln. Kanske var det gamla lösenordet fel.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Krypteringsprogrammet kunde inte initieras! Möjligen blev krypteringsprogrammet återaktiverad under din session. Försök med att logga ut och in igen för att initiera krypteringsprogrammet.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Lösenordet för din privata nyckel är inte giltig! Troligen har ditt lösenord ändrats utanför ownCloud (t.ex. i företagets katalogtjänst). Du kan uppdatera lösenordet för den privata nyckeln under dina personliga inställningar för att återfå tillgång till dina filer.",
 "Missing requirements." => "Krav som saknas",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Kontrollera att PHP 5.3.3 eller senare är installerad och att tillägget OpenSSL PHP är aktiverad och korrekt konfigurerad. Kryptering är tillsvidare inaktiverad.",
 "Following users are not set up for encryption:" => "Följande användare har inte aktiverat kryptering:",
 "Saving..." => "Sparar...",
+"Go directly to your " => "Gå direkt till din",
 "personal settings" => "personliga inställningar",
 "Encryption" => "Kryptering",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Aktivera lösenordsnyckel (för att kunna återfå användarens filer vid glömt eller förlorat lösenord):",
-"Recovery key password" => "Lösenordsnyckel",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Aktivera återställningsnyckel (för att kunna återfå användarens filer vid glömt eller förlorat lösenord):",
+"Recovery key password" => "Lösenord för återställningsnyckel",
+"Repeat Recovery key password" => "Upprepa återställningsnyckelns lösenord",
 "Enabled" => "Aktiverad",
 "Disabled" => "Inaktiverad",
-"Change recovery key password:" => "Ändra lösenordsnyckel:",
-"Old Recovery key password" => "Gammal lösenordsnyckel",
-"New Recovery key password" => "Ny lösenordsnyckel",
+"Change recovery key password:" => "Ändra lösenord för återställningsnyckel:",
+"Old Recovery key password" => "Gammalt lösenord för återställningsnyckel",
+"New Recovery key password" => "Nytt lösenord för återställningsnyckel",
+"Repeat New Recovery key password" => "Upprepa lösenord för ny återställningsnyckel",
 "Change Password" => "Byt lösenord",
-"Your private key password no longer match your log-in password:" => "Din privata lösenordsnyckel stämmer inte längre överrens med ditt inloggningslösenord:",
-"Set your old private key password to your current log-in password." => "Ställ in din gamla privata lösenordsnyckel till ditt aktuella inloggningslösenord.",
+"Your private key password no longer match your log-in password:" => "Lösenordet till din privata nyckel stämmer inte längre överens med ditt inloggningslösenord:",
+"Set your old private key password to your current log-in password." => "Använd din gamla privata nyckels lösenord som ditt aktuella inloggningslösenord.",
 " If you don't remember your old password you can ask your administrator to recover your files." => "Om du inte kommer ihåg ditt gamla lösenord kan du be din administratör att återställa dina filer.",
 "Old log-in password" => "Gammalt inloggningslösenord",
 "Current log-in password" => "Nuvarande inloggningslösenord",
-"Update Private Key Password" => "Uppdatera den privata lösenordsnyckeln",
+"Update Private Key Password" => "Uppdatera lösenordet för din privata nyckel",
 "Enable password recovery:" => "Aktivera lösenordsåterställning",
 "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Genom att aktivera detta alternativ kommer du kunna återfå tillgång till dina krypterade filer om du skulle förlora/glömma ditt lösenord",
 "File recovery settings updated" => "Inställningarna för filåterställning har uppdaterats",
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index c009718160ae360d47b4abce3822d9c9fea6fcde..9155d238c771f0afab2ec56008ac42abd83cb14b 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -33,6 +33,12 @@ require_once __DIR__ . '/../3rdparty/Crypt_Blowfish/Blowfish.php';
 
 class Crypt {
 
+	const ENCRYPTION_UNKNOWN_ERROR = -1;
+	const ENCRYPTION_NOT_INITIALIZED_ERROR = 1;
+	const ENCRYPTION_PRIVATE_KEY_NOT_VALID_ERROR = 2;
+	const ENCRYPTION_NO_SHARE_KEY_FOUND = 3;
+
+
 	/**
 	 * @brief return encryption mode client or server side encryption
 	 * @param string $user name (use system wide setting if name=null)
@@ -183,8 +189,8 @@ class Crypt {
 		// 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 
+		// 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'])
 			&& $metadata['encrypted'] === true
@@ -388,7 +394,7 @@ class Crypt {
 	 */
 	public static function multiKeyEncrypt($plainContent, array $publicKeys) {
 
-		// openssl_seal returns false without errors if $plainContent 
+		// openssl_seal returns false without errors if $plainContent
 		// is empty, so trigger our own error
 		if (empty($plainContent)) {
 
@@ -405,7 +411,7 @@ class Crypt {
 
 			$i = 0;
 
-			// Ensure each shareKey is labelled with its 
+			// Ensure each shareKey is labelled with its
 			// corresponding userId
 			foreach ($publicKeys as $userId => $publicKey) {
 
@@ -476,7 +482,7 @@ class Crypt {
 
 			}
 
-			// We encode the iv purely for string manipulation 
+			// We encode the iv purely for string manipulation
 			// purposes - it gets decoded before use
 			$iv = base64_encode($random);
 
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index ebfc00157f71820982baa7806b26cd49ee687486..a754f9f28c4bfd6b18046bb5daa888dc0cd31fa0 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -235,16 +235,28 @@ class Helper {
 	/**
 	 * @brief redirect to a error page
 	 */
-	public static function redirectToErrorPage($session) {
-
-		$init = $session->getInitialized();
+	public static function redirectToErrorPage($session, $errorCode = null) {
+
+		if ($errorCode === null) {
+			$init = $session->getInitialized();
+			switch ($init) {
+				case \OCA\Encryption\Session::INIT_EXECUTED:
+					$errorCode = \OCA\Encryption\Crypt::ENCRYPTION_PRIVATE_KEY_NOT_VALID_ERROR;
+					break;
+				case \OCA\Encryption\Session::NOT_INITIALIZED:
+					$errorCode = \OCA\Encryption\Crypt::ENCRYPTION_NOT_INITIALIZED_ERROR;
+					break;
+				default:
+					$errorCode = \OCA\Encryption\Crypt::ENCRYPTION_UNKNOWN_ERROR;
+			}
+		}
 
 		$location = \OC_Helper::linkToAbsolute('apps/files_encryption/files', 'error.php');
 		$post = 0;
 		if(count($_POST) > 0) {
 			$post = 1;
 			}
-			header('Location: ' . $location . '?p=' . $post . '&i=' . $init);
+			header('Location: ' . $location . '?p=' . $post . '&errorCode=' . $errorCode);
 			exit();
 	}
 
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 6f630c83a3f5b277477155e461331aaeef840a07..8621c1ba51d6199dc8c49f46a06fa1ed3cc35c03 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -38,8 +38,6 @@ class Proxy extends \OC_FileProxy {
 
 	private static $blackList = null; //mimetypes blacklisted from encryption
 
-	private static $enableEncryption = null;
-
 	/**
 	 * Check if a file requires encryption
 	 * @param string $path
@@ -49,46 +47,22 @@ class Proxy extends \OC_FileProxy {
 	 */
 	private static function shouldEncrypt($path) {
 
-		if (is_null(self::$enableEncryption)) {
-			if (
-				\OCP\App::isEnabled('files_encryption') === true
-				&& Crypt::mode() === 'server'
-			) {
-
-				self::$enableEncryption = true;
-
-			} else {
-
-				self::$enableEncryption = false;
-
-			}
-
-		}
-
-		if (!self::$enableEncryption) {
-
+		if (\OCP\App::isEnabled('files_encryption') === false || Crypt::mode() !== 'server') {
 			return false;
-
 		}
 
 		if (is_null(self::$blackList)) {
-
 			self::$blackList = explode(',', \OCP\Config::getAppValue('files_encryption', 'type_blacklist', ''));
-
 		}
 
 		if (Crypt::isCatfileContent($path)) {
-
 			return true;
-
 		}
 
 		$extension = substr($path, strrpos($path, '.') + 1);
 
 		if (array_search($extension, self::$blackList) === false) {
-
 			return true;
-
 		}
 
 		return false;
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 02955bb064e982b9020a90b788021e95c59011a0..5ce5caf80ce21d44e6ce001e1280137df5c329a4 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -254,16 +254,20 @@ class Stream {
 		// If a keyfile already exists
 		if ($this->encKeyfile) {
 
+			$shareKey = Keymanager::getShareKey($this->rootView, $this->userId, $this->relPath);
+
 			// if there is no valid private key return false
 			if ($this->privateKey === false) {
-
 				// if private key is not valid redirect user to a error page
-				\OCA\Encryption\Helper::redirectToErrorPage();
-
+				\OCA\Encryption\Helper::redirectToErrorPage($this->session);
 				return false;
 			}
 
-			$shareKey = Keymanager::getShareKey($this->rootView, $this->userId, $this->relPath);
+			if ($shareKey === false) {
+				// if no share key is available redirect user to a error page
+				\OCA\Encryption\Helper::redirectToErrorPage($this->session, \OCA\Encryption\Crypt::ENCRYPTION_NO_SHARE_KEY_FOUND);
+				return false;
+			}
 
 			$this->plainKey = Crypt::multiKeyDecrypt($this->encKeyfile, $shareKey, $this->privateKey);
 
@@ -506,9 +510,10 @@ class Stream {
 
 				// Get all users sharing the file includes current user
 				$uniqueUserIds = $util->getSharingUsersArray($sharingEnabled, $this->relPath, $this->userId);
+				$checkedUserIds = $util->filterShareReadyUsers($uniqueUserIds);
 
 				// Fetch public keys for all sharing users
-				$publicKeys = Keymanager::getPublicKeys($this->rootView, $uniqueUserIds);
+				$publicKeys = Keymanager::getPublicKeys($this->rootView, $checkedUserIds['ready']);
 
 				// Encrypt enc key for all sharing users
 				$this->encKeyfiles = Crypt::multiKeyEncrypt($this->plainKey, $publicKeys);
diff --git a/apps/files_encryption/templates/invalid_private_key.php b/apps/files_encryption/templates/invalid_private_key.php
index 9af65f831b43949b8c9c2060351e73079ad154f8..a3cae60b1da5656ec542323586b6bfce84b982a4 100644
--- a/apps/files_encryption/templates/invalid_private_key.php
+++ b/apps/files_encryption/templates/invalid_private_key.php
@@ -4,7 +4,7 @@
 
 		<?php p($_['message']); ?>
 		<br/>
-		<?php if($_['init']): ?>
+		<?php if($_['errorCode'] === \OCA\Encryption\Crypt::ENCRYPTION_PRIVATE_KEY_NOT_VALID_ERROR): ?>
 			<?php>p($l->t('Go directly to your ')); ?> <a href="<?php echo $location?>"><?php p($l->t('personal settings')); ?>.</a>
 		<?php endif; ?>
 		<br/>
diff --git a/apps/files_encryption/templates/settings-admin.php b/apps/files_encryption/templates/settings-admin.php
index 3a6adc09f4b55ea2fee868aaee61de506891a033..231a68b6a587d51ed097593b60407da2d55426a1 100644
--- a/apps/files_encryption/templates/settings-admin.php
+++ b/apps/files_encryption/templates/settings-admin.php
@@ -1,10 +1,7 @@
 <form id="encryption">
 	<fieldset class="personalblock">
 
-		<p>
-			<strong><?php p($l->t('Encryption')); ?></strong>
-			<br/>
-		</p>
+		<h2><?php p($l->t('Encryption')); ?></h2>
 
 		<p>
 			<?php p($l->t("Enable recovery key (allow to recover users files in case of password loss):")); ?>
diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index ff04556dd53ef9e9d5e104e6aa05fc6db857562c..a4ed89b8a49472d948ea142cd5cf33ef98f4e4a2 100644
--- a/apps/files_encryption/templates/settings-personal.php
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -1,8 +1,6 @@
 <form id="encryption">
 	<fieldset class="personalblock">
-		<legend>
-			<?php p( $l->t( 'Encryption' ) ); ?>
-		</legend>
+		<h2><?php p( $l->t( 'Encryption' ) ); ?></h2>
 
 		<?php if ( ! $_["privateKeySet"] && $_["initialized"] ): ?>
 			<p>
@@ -38,9 +36,8 @@
 			</p>
 		<?php endif; ?>
 
-		<br />
-
 		<?php if ( $_["recoveryEnabled"] && $_["privateKeySet"] ): ?>
+			<br />
 			<p>
 				<label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery:" ) ); ?></label>
 				<br />
@@ -65,6 +62,5 @@
 			</p>
 		<?php endif; ?>
 
-		<br />
 	</fieldset>
 </form>
diff --git a/apps/files_external/3rdparty/smb4php/smb.php b/apps/files_external/3rdparty/smb4php/smb.php
index e7d1dfa09fec9ba8f42c3ba1f0290191231fd472..e91b0a59581b21aadcf2e838cb577cb5888f447f 100644
--- a/apps/files_external/3rdparty/smb4php/smb.php
+++ b/apps/files_external/3rdparty/smb4php/smb.php
@@ -181,6 +181,8 @@ class smb {
 						return false;
 					}elseif(substr($regs[0],0,31)=='NT_STATUS_OBJECT_PATH_NOT_FOUND'){
 						return false;
+					}elseif(substr($regs[0],0,31)=='NT_STATUS_OBJECT_NAME_NOT_FOUND'){
+						return false;
 					}elseif(substr($regs[0],0,29)=='NT_STATUS_FILE_IS_A_DIRECTORY'){
 						return false;
 					}
@@ -305,7 +307,8 @@ class smb {
 			trigger_error('rename(): error in URL', E_USER_ERROR);
 		}
 		smb::clearstatcache ($url_from);
-		return smb::execute ('rename "'.$from['path'].'" "'.$to['path'].'"', $to);
+		$result = smb::execute ('rename "'.$from['path'].'" "'.$to['path'].'"', $to);
+		return $result !== false;
 	}
 
 	function mkdir ($url, $mode, $options) {
@@ -430,7 +433,10 @@ class smb_stream_wrapper extends smb {
 			case 'rb':
 			case 'a':
 			case 'a+':  $this->tmpfile = tempnam('/tmp', 'smb.down.');
-				smb::execute ('get "'.$pu['path'].'" "'.$this->tmpfile.'"', $pu);
+				$result = smb::execute ('get "'.$pu['path'].'" "'.$this->tmpfile.'"', $pu);
+				if($result === false){
+					return $result;
+				}
 				break;
 			case 'w':
 			case 'w+':
diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css
index f2f40247b28c02b9875dda7a26c29e8722f0d7a4..0ebae9d82bed86b19198e57e62073cf52aef23a9 100644
--- a/apps/files_external/css/settings.css
+++ b/apps/files_external/css/settings.css
@@ -4,7 +4,6 @@ td.status > span {
 	width: 16px;
 	vertical-align: text-bottom;
 }
-
 span.success {
 	background: #37ce02;
 	border-radius: 8px;
@@ -12,9 +11,6 @@ span.success {
 span.error {
 	background: #ce3702;
 }
-span.waiting {
-	background: none;
-}
 
 td.mountPoint, td.backend { width:10em; }
 td.remove>img { visibility:hidden; padding-top:0.8em; }
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 3e605c59a9304491635a5b24094e3af9e6774b39..886c324e338cfaaf742ee1ba3194c3f5d6fce580 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -1,10 +1,23 @@
+(function(){
+
+function updateStatus(statusEl, result){
+	statusEl.removeClass('success error loading-small');
+	if (result && result.status == 'success' && result.data.message) {
+		statusEl.addClass('success');
+		return true;
+	} else {
+		statusEl.addClass('error');
+		return false;
+	}
+}
+
 OC.MountConfig={
 	saveStorage:function(tr) {
 		var mountPoint = $(tr).find('.mountPoint input').val();
 		if (mountPoint == '') {
 			return false;
 		}
-		var statusSpan = $(tr).find('.status span');
+		var statusSpan = $(tr).closest('tr').find('.status span');
 		var backendClass = $(tr).find('.backend').data('class');
 		var configuration = $(tr).find('.configuration input');
 		var addMountPoint = true;
@@ -58,6 +71,7 @@ OC.MountConfig={
 						}
 						users.push(applicable);
 					}
+					statusSpan.addClass('loading-small').removeClass('error success');
 					$.ajax({type: 'POST',
 						url: OC.filePath('files_external', 'ajax', 'addMountPoint.php'),
 						data: {
@@ -68,15 +82,11 @@ OC.MountConfig={
 							applicable: applicable,
 							isPersonal: isPersonal
 						},
-						async: false,
 						success: function(result) {
-							statusSpan.removeClass();
-							if (result && result.status == 'success' && result.data.message) {
-								status = true;
-								statusSpan.addClass('success');
-							} else {
-								statusSpan.addClass('error');
-							}
+							status = updateStatus(statusSpan, result);
+						},
+						error: function(result){
+							status = updateStatus(statusSpan, result);
 						}
 					});
 				});
@@ -93,8 +103,7 @@ OC.MountConfig={
 							mountType: mountType,
 							applicable: applicable,
 							isPersonal: isPersonal
-						},
-						async: false
+						}
 					});
 				});
 				var mountType = 'user';
@@ -108,14 +117,14 @@ OC.MountConfig={
 							mountType: mountType,
 							applicable: applicable,
 							isPersonal: isPersonal
-						},
-						async: false
+						}
 					});
 				});
 			} else {
 				var isPersonal = true;
 				var mountType = 'user';
 				var applicable = OC.currentUser;
+				statusSpan.addClass('loading-small').removeClass('error success');
 				$.ajax({type: 'POST',
 					url: OC.filePath('files_external', 'ajax', 'addMountPoint.php'),
 					data: {
@@ -126,15 +135,11 @@ OC.MountConfig={
 						applicable: applicable,
 						isPersonal: isPersonal
 					},
-					async: false,
 					success: function(result) {
-						statusSpan.removeClass();
-						if (result && result.status == 'success' && result.data.message) {
-							status = true;
-							statusSpan.addClass('success');
-						} else {
-							statusSpan.addClass('error');
-						}
+						status = updateStatus(statusSpan, result);
+					},
+					error: function(result){
+						status = updateStatus(statusSpan, result);
 					}
 				});
 			}
@@ -157,7 +162,7 @@ $(document).ready(function() {
 			$(tr).find('.mountPoint input').val(suggestMountPoint(selected));
 		}
 		$(tr).addClass(backendClass);
-		$(tr).find('.status').append('<span class="waiting"></span>');
+		$(tr).find('.status').append('<span></span>');
 		$(tr).find('.backend').data('class', backendClass);
 		var configurations = $(this).data('configurations');
 		var td = $(tr).find('td.configuration');
@@ -293,3 +298,5 @@ $(document).ready(function() {
 	});
 
 });
+
+})();
diff --git a/apps/files_external/l10n/ar.php b/apps/files_external/l10n/ar.php
index 905d221e886d43f4ec75fec51336841f9f81d9ee..055c6895823c1aa4c5e68b885dd907ef081d1862 100644
--- a/apps/files_external/l10n/ar.php
+++ b/apps/files_external/l10n/ar.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Folder name" => "اسم المجلد",
+"All Users" => "كل المستخدمين",
 "Groups" => "مجموعات",
 "Users" => "المستخدمين",
 "Delete" => "إلغاء"
diff --git a/apps/files_external/lib/streamwrapper.php b/apps/files_external/lib/streamwrapper.php
index beb4ec5605f47900c8a556ed6e42d3967cbc82f9..4a63dfb6e0277b6c6fd9d5286fe7a42257ba7f9f 100644
--- a/apps/files_external/lib/streamwrapper.php
+++ b/apps/files_external/lib/streamwrapper.php
@@ -8,7 +8,7 @@
 
 namespace OC\Files\Storage;
 
-abstract class StreamWrapper extends Common{
+abstract class StreamWrapper extends Common {
 	abstract public function constructUrl($path);
 
 	public function mkdir($path) {
@@ -16,7 +16,15 @@ abstract class StreamWrapper extends Common{
 	}
 
 	public function rmdir($path) {
-		if($this->file_exists($path)) {
+		if ($this->file_exists($path)) {
+			$dh = $this->opendir($path);
+			while (($file = readdir($dh)) !== false) {
+				if ($this->is_dir($path . '/' . $file)) {
+					$this->rmdir($path . '/' . $file);
+				} else {
+					$this->unlink($path . '/' . $file);
+				}
+			}
 			$success = rmdir($this->constructUrl($path));
 			clearstatcache();
 			return $success;
@@ -34,11 +42,11 @@ abstract class StreamWrapper extends Common{
 	}
 
 	public function isReadable($path) {
-		return true;//not properly supported
+		return true; //not properly supported
 	}
 
 	public function isUpdatable($path) {
-		return true;//not properly supported
+		return true; //not properly supported
 	}
 
 	public function file_exists($path) {
@@ -55,15 +63,19 @@ abstract class StreamWrapper extends Common{
 		return fopen($this->constructUrl($path), $mode);
 	}
 
-	public function touch($path, $mtime=null) {
-		if(is_null($mtime)) {
-			$fh = $this->fopen($path, 'a');
-			fwrite($fh, '');
-			fclose($fh);
-
-			return true;
+	public function touch($path, $mtime = null) {
+		if ($this->file_exists($path)) {
+			if (is_null($mtime)) {
+				$fh = $this->fopen($path, 'a');
+				fwrite($fh, '');
+				fclose($fh);
+
+				return true;
+			} else {
+				return false; //not supported
+			}
 		} else {
-			return false;//not supported
+			$this->file_put_contents($path, '');
 		}
 	}
 
diff --git a/apps/files_external/tests/smb.php b/apps/files_external/tests/smb.php
index ca2a93c894449f5584be40d6b996cc339b3aec89..0291f293fa6208e1524bfc5a6aed8e69c92ab5e6 100644
--- a/apps/files_external/tests/smb.php
+++ b/apps/files_external/tests/smb.php
@@ -15,7 +15,7 @@ class SMB extends Storage {
 	public function setUp() {
 		$id = uniqid();
 		$this->config = include('files_external/tests/config.php');
-		if ( ! is_array($this->config) or ! isset($this->config['smb']) or ! $this->config['smb']['run']) {
+		if (!is_array($this->config) or !isset($this->config['smb']) or !$this->config['smb']['run']) {
 			$this->markTestSkipped('Samba backend not configured');
 		}
 		$this->config['smb']['root'] .= $id; //make sure we have an new empty folder to work in
@@ -28,4 +28,11 @@ class SMB extends Storage {
 			\OCP\Files::rmdirr($this->instance->constructUrl(''));
 		}
 	}
+
+	public function testRenameWithSpaces() {
+		$this->instance->mkdir('with spaces');
+		$result = $this->instance->rename('with spaces', 'foo bar');
+		$this->assertTrue($result);
+		$this->assertTrue($this->instance->is_dir('foo bar'));
+	}
 }
diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php
index bc33dd40437ab3bbd6dd9a61193076045f4593e7..0d827da28eab18d8ad98a414bb9cf2899bd761f8 100644
--- a/apps/files_sharing/appinfo/update.php
+++ b/apps/files_sharing/appinfo/update.php
@@ -70,10 +70,10 @@ if (version_compare($installedVersion, '0.3', '<')) {
 }
 
 // clean up oc_share table from files which are no longer exists
-if (version_compare($installedVersion, '0.3.4', '<')) {
+if (version_compare($installedVersion, '0.3.5', '<')) {
 
 	// get all shares where the original file no longer exists
-	$findShares = \OC_DB::prepare('SELECT `file_source` FROM `*PREFIX*share` LEFT JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid` WHERE `*PREFIX*filecache`.`fileid` IS NULL');
+	$findShares = \OC_DB::prepare('SELECT `file_source` FROM `*PREFIX*share` LEFT JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid` WHERE `*PREFIX*filecache`.`fileid` IS NULL AND `*PREFIX*share`.`item_type` IN (\'file\', \'folder\')');
 	$sharesFound = $findShares->execute(array())->fetchAll();
 
 	// delete those shares from the oc_share table
diff --git a/apps/files_sharing/appinfo/version b/apps/files_sharing/appinfo/version
index 448a0fa11cdb5dc89bd34011f071df2a56ee44d9..09e9157034c28c1c2516f005c9306248219630c4 100644
--- a/apps/files_sharing/appinfo/version
+++ b/apps/files_sharing/appinfo/version
@@ -1 +1 @@
-0.3.4
\ No newline at end of file
+0.3.5
\ No newline at end of file
diff --git a/apps/files_sharing/css/authenticate.css b/apps/files_sharing/css/authenticate.css
new file mode 100644
index 0000000000000000000000000000000000000000..cebe906dd59f1417d7a6f8601c8fc8a3af136650
--- /dev/null
+++ b/apps/files_sharing/css/authenticate.css
@@ -0,0 +1,26 @@
+#body-login form label.infield {
+	width: 190px;
+	padding: 10px;
+	left: 8px;
+	top: 8px;
+}
+
+#password {
+	width: 190px !important;
+	padding: 10px;
+	margin:	6px;
+}
+
+input[type="submit"]{
+	width: 45px;
+	height: 45px;
+	margin:	6px;
+	background-image: url('%webroot%/core/img/actions/confirm.svg');
+	background-repeat: no-repeat;
+	background-position: center;
+}
+
+#body-login input[type="submit"] {
+	position: absolute;
+	top: 0px;
+}
diff --git a/apps/files_sharing/l10n/ar.php b/apps/files_sharing/l10n/ar.php
index ff7b40d16bcde171fa92ce65d9bb974706e660ea..2625af1cc0042dd026a26112532ebe2c5fe11896 100644
--- a/apps/files_sharing/l10n/ar.php
+++ b/apps/files_sharing/l10n/ar.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "كلمة المرور",
-"Submit" => "تطبيق",
 "%s shared the folder %s with you" => "%s شارك المجلد %s معك",
 "%s shared the file %s with you" => "%s شارك الملف %s معك",
 "Download" => "تحميل",
diff --git a/apps/files_sharing/l10n/bg_BG.php b/apps/files_sharing/l10n/bg_BG.php
index 1094870fd0fc20648a87bbb25da2e6d50df77541..f4b9e2dd5fc930e22f90bc867bbbcf8fbf35e01e 100644
--- a/apps/files_sharing/l10n/bg_BG.php
+++ b/apps/files_sharing/l10n/bg_BG.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Парола",
-"Submit" => "Потвърждение",
 "%s shared the folder %s with you" => "%s сподели папката %s с Вас",
 "%s shared the file %s with you" => "%s сподели файла %s с Вас",
 "Download" => "Изтегляне",
diff --git a/apps/files_sharing/l10n/bn_BD.php b/apps/files_sharing/l10n/bn_BD.php
index 71b948e347ba311b6dd8b13ea07ef25a3d1dc841..aaed904d9d702cce2be4cbf89d65e12f2476f3d6 100644
--- a/apps/files_sharing/l10n/bn_BD.php
+++ b/apps/files_sharing/l10n/bn_BD.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "কূটশব্দ",
-"Submit" => "জমা দিন",
 "%s shared the folder %s with you" => "%s আপনার সাথে %s ফোল্ডারটি ভাগাভাগি করেছেন",
 "%s shared the file %s with you" => "%s আপনার সাথে %s ফাইলটি ভাগাভাগি করেছেন",
 "Download" => "ডাউনলোড",
diff --git a/apps/files_sharing/l10n/ca.php b/apps/files_sharing/l10n/ca.php
index cbe8f86e253d8eb6aecfffa8b7c7ec1d8cea0882..e5e5910f8cf3c9ad2c6be998c16161d0e1bbb1f9 100644
--- a/apps/files_sharing/l10n/ca.php
+++ b/apps/files_sharing/l10n/ca.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "la contrasenya és incorrecta. Intenteu-ho de nou.",
 "Password" => "Contrasenya",
-"Submit" => "Envia",
 "Sorry, this link doesn’t seem to work anymore." => "Aquest enllaç sembla que no funciona.",
 "Reasons might be:" => "Les raons podrien ser:",
 "the item was removed" => "l'element ha estat eliminat",
diff --git a/apps/files_sharing/l10n/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php
index 7258dedcf6d76c47e81942539cb89a8ca978ca29..7888ec258704c48342a7907497be5929e38ff737 100644
--- a/apps/files_sharing/l10n/cs_CZ.php
+++ b/apps/files_sharing/l10n/cs_CZ.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Heslo není správné. Zkuste to znovu.",
 "Password" => "Heslo",
-"Submit" => "Odeslat",
 "Sorry, this link doesn’t seem to work anymore." => "Je nám líto, ale tento odkaz již není funkční.",
 "Reasons might be:" => "Možné důvody:",
 "the item was removed" => "položka byla odebrána",
diff --git a/apps/files_sharing/l10n/cy_GB.php b/apps/files_sharing/l10n/cy_GB.php
index 66fbc4e1d1c3f249e88eacce8391967c75e78dbe..d2ae28141d473be6adae7a40731d6eca2ccec091 100644
--- a/apps/files_sharing/l10n/cy_GB.php
+++ b/apps/files_sharing/l10n/cy_GB.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Cyfrinair",
-"Submit" => "Cyflwyno",
 "%s shared the folder %s with you" => "Rhannodd %s blygell %s â chi",
 "%s shared the file %s with you" => "Rhannodd %s ffeil %s â chi",
 "Download" => "Llwytho i lawr",
diff --git a/apps/files_sharing/l10n/da.php b/apps/files_sharing/l10n/da.php
index 0ca0f38161a38836f4858b9dec22d062d2ac2015..aef3ad988119f222adccf458bc35b43d3217a22d 100644
--- a/apps/files_sharing/l10n/da.php
+++ b/apps/files_sharing/l10n/da.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Kodeordet er forkert. Prøv igen.",
 "Password" => "Kodeord",
-"Submit" => "Send",
 "Sorry, this link doesn’t seem to work anymore." => "Desværre, dette link ser ikke ud til at fungerer længere.",
 "Reasons might be:" => "Årsagen kan være:",
 "the item was removed" => "Filen blev fjernet",
diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php
index afed17d8839443916bbd9c10c2c899a57152017f..bfec2ced10aa87c6a990e48a47962492e0c0462e 100644
--- a/apps/files_sharing/l10n/de.php
+++ b/apps/files_sharing/l10n/de.php
@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"This share is password-protected" => "Diese Freigabe ist durch ein Passwort geschützt",
 "The password is wrong. Try again." => "Bitte überprüfen sie Ihr Passwort und versuchen Sie es erneut.",
 "Password" => "Passwort",
-"Submit" => "Absenden",
 "Sorry, this link doesn’t seem to work anymore." => "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.",
 "Reasons might be:" => "Gründe könnten sein:",
 "the item was removed" => "Die Elemente wurden entfernt",
diff --git a/apps/files_sharing/l10n/de_CH.php b/apps/files_sharing/l10n/de_CH.php
index 1bd24f9d9c4bf47ebb1020c2f4a14e3b256a617a..f63714b902fd7db5ba4a35a7ec3791d70fb450be 100644
--- a/apps/files_sharing/l10n/de_CH.php
+++ b/apps/files_sharing/l10n/de_CH.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
 "Password" => "Passwort",
-"Submit" => "Bestätigen",
 "Sorry, this link doesn’t seem to work anymore." => "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.",
 "Reasons might be:" => "Gründe könnten sein:",
 "the item was removed" => "Das Element wurde entfernt",
diff --git a/apps/files_sharing/l10n/de_DE.php b/apps/files_sharing/l10n/de_DE.php
index 1bd24f9d9c4bf47ebb1020c2f4a14e3b256a617a..fa0080088d14fee80b9d79673a1984c8ae162ccb 100644
--- a/apps/files_sharing/l10n/de_DE.php
+++ b/apps/files_sharing/l10n/de_DE.php
@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"This share is password-protected" => "Diese Freigabe ist durch ein Passwort geschützt",
 "The password is wrong. Try again." => "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
 "Password" => "Passwort",
-"Submit" => "Bestätigen",
 "Sorry, this link doesn’t seem to work anymore." => "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.",
 "Reasons might be:" => "Gründe könnten sein:",
 "the item was removed" => "Das Element wurde entfernt",
diff --git a/apps/files_sharing/l10n/el.php b/apps/files_sharing/l10n/el.php
index 93486a831b1972921f716e5deeebfa5d83d7a928..4584e261b017ba9b0f33d0c9f6746ffa5d3251de 100644
--- a/apps/files_sharing/l10n/el.php
+++ b/apps/files_sharing/l10n/el.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Εσφαλμένο συνθηματικό. Προσπαθήστε ξανά.",
 "Password" => "Συνθηματικό",
-"Submit" => "Καταχώρηση",
 "Sorry, this link doesn’t seem to work anymore." => "Συγγνώμη, αυτός ο σύνδεσμος μοιάζει να μην ισχύει πια.",
 "Reasons might be:" => "Οι λόγοι μπορεί να είναι:",
 "the item was removed" => "το αντικείμενο απομακρύνθηκε",
diff --git a/apps/files_sharing/l10n/en@pirate.php b/apps/files_sharing/l10n/en@pirate.php
index a60f1fe72f21bbd77cf7d26638589765ba881bb2..cd3c00d29d2d198c06c3b9bb9cbfd227d419bc56 100644
--- a/apps/files_sharing/l10n/en@pirate.php
+++ b/apps/files_sharing/l10n/en@pirate.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Secret Code",
-"Submit" => "Submit",
 "%s shared the folder %s with you" => "%s shared the folder %s with you",
 "%s shared the file %s with you" => "%s shared the file %s with you",
 "Download" => "Download",
diff --git a/apps/files_sharing/l10n/en_GB.php b/apps/files_sharing/l10n/en_GB.php
index 337c108651eb0c793382e950ffb44a557d343857..958f38557d2aef2bcb34fac95cef1df8479fcb9b 100644
--- a/apps/files_sharing/l10n/en_GB.php
+++ b/apps/files_sharing/l10n/en_GB.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "The password is wrong. Try again.",
 "Password" => "Password",
-"Submit" => "Submit",
 "Sorry, this link doesn’t seem to work anymore." => "Sorry, this link doesn’t seem to work anymore.",
 "Reasons might be:" => "Reasons might be:",
 "the item was removed" => "the item was removed",
diff --git a/apps/files_sharing/l10n/eo.php b/apps/files_sharing/l10n/eo.php
index 70e703bda91a9ad41709c0aa7614ffcc5e809d91..294dc0314cce0671e6453129a0e4d216d9a27ffd 100644
--- a/apps/files_sharing/l10n/eo.php
+++ b/apps/files_sharing/l10n/eo.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Pasvorto",
-"Submit" => "Sendi",
 "%s shared the folder %s with you" => "%s kunhavigis la dosierujon %s kun vi",
 "%s shared the file %s with you" => "%s kunhavigis la dosieron %s kun vi",
 "Download" => "Elŝuti",
diff --git a/apps/files_sharing/l10n/es.php b/apps/files_sharing/l10n/es.php
index e163da766f34bd0edcb518bea57cacc48e386ba2..45e4563b691b5988ddacadac4fc312294839a363 100644
--- a/apps/files_sharing/l10n/es.php
+++ b/apps/files_sharing/l10n/es.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "La contraseña introducida es errónea. Inténtelo de nuevo.",
 "Password" => "Contraseña",
-"Submit" => "Enviar",
 "Sorry, this link doesn’t seem to work anymore." => "Vaya, este enlace parece que no volverá a funcionar.",
 "Reasons might be:" => "Las causas podrían ser:",
 "the item was removed" => "el elemento fue eliminado",
diff --git a/apps/files_sharing/l10n/es_AR.php b/apps/files_sharing/l10n/es_AR.php
index 7c9dcb94ac19b4f258195d0a8148b595cae5a1a3..989a91a450fb9b8700a59696423e4711ed331537 100644
--- a/apps/files_sharing/l10n/es_AR.php
+++ b/apps/files_sharing/l10n/es_AR.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "La contraseña no es correcta. Probá de nuevo.",
 "Password" => "Contraseña",
-"Submit" => "Enviar",
 "Sorry, this link doesn’t seem to work anymore." => "Perdón, este enlace parece no funcionar más.",
 "Reasons might be:" => "Las causas podrían ser:",
 "the item was removed" => "el elemento fue borrado",
diff --git a/apps/files_sharing/l10n/et_EE.php b/apps/files_sharing/l10n/et_EE.php
index fe230902ff1b9f75cb727b7094b41c04fbb9f8d1..b70cbb3e7e326b701ae96656d4b7fd97a82abf02 100644
--- a/apps/files_sharing/l10n/et_EE.php
+++ b/apps/files_sharing/l10n/et_EE.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Parool on vale. Proovi uuesti.",
 "Password" => "Parool",
-"Submit" => "Saada",
 "Sorry, this link doesn’t seem to work anymore." => "Vabandust, see link ei tundu enam toimivat.",
 "Reasons might be:" => "Põhjused võivad olla:",
 "the item was removed" => "üksus on eemaldatud",
diff --git a/apps/files_sharing/l10n/eu.php b/apps/files_sharing/l10n/eu.php
index 7b6a4b08b3c603fecdf139d12a980e493e40684c..91be195368a6d9c18cc3f10f5716dba8c5119e7c 100644
--- a/apps/files_sharing/l10n/eu.php
+++ b/apps/files_sharing/l10n/eu.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Pasahitza ez da egokia. Saiatu berriro.",
 "Password" => "Pasahitza",
-"Submit" => "Bidali",
 "Sorry, this link doesn’t seem to work anymore." => "Barkatu, lotura ez dirudi eskuragarria dagoenik.",
 "Reasons might be:" => "Arrazoiak hurrengoak litezke:",
 "the item was removed" => "fitxategia ezbatua izan da",
diff --git a/apps/files_sharing/l10n/fa.php b/apps/files_sharing/l10n/fa.php
index 48888f798a0a1e505b8ed09b1de3994d277c6b36..664338723c47a5380d8ecb3d550049832cd8aff1 100644
--- a/apps/files_sharing/l10n/fa.php
+++ b/apps/files_sharing/l10n/fa.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "رمزعبور اشتباه می باشد. دوباره امتحان کنید.",
 "Password" => "گذرواژه",
-"Submit" => "ثبت",
 "%s shared the folder %s with you" => "%sپوشه %s را با شما به اشتراک گذاشت",
 "%s shared the file %s with you" => "%sفایل %s را با شما به اشتراک گذاشت",
 "Download" => "دانلود",
diff --git a/apps/files_sharing/l10n/fi_FI.php b/apps/files_sharing/l10n/fi_FI.php
index 42905be57a686d0e48c543442683b9c80a8c58be..44942fe30af7e12d80e0ff35615b3d9c814c742b 100644
--- a/apps/files_sharing/l10n/fi_FI.php
+++ b/apps/files_sharing/l10n/fi_FI.php
@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"This share is password-protected" => "Tämä jako on suojattu salasanalla",
 "The password is wrong. Try again." => "Väärä salasana. Yritä uudelleen.",
 "Password" => "Salasana",
-"Submit" => "Lähetä",
 "Sorry, this link doesn’t seem to work anymore." => "Valitettavasti linkki ei vaikuta enää toimivan.",
 "Reasons might be:" => "Mahdollisia syitä:",
 "the item was removed" => "kohde poistettiin",
diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php
index c97a1db97e4a2170e7e398841928d84a7b6c8e14..11cfabc22fd664e83d2a23d12f6b20ba11369f31 100644
--- a/apps/files_sharing/l10n/fr.php
+++ b/apps/files_sharing/l10n/fr.php
@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"This share is password-protected" => "Ce partage est protégé par un mot de passe",
 "The password is wrong. Try again." => "Le mot de passe est incorrect. Veuillez réessayer.",
 "Password" => "Mot de passe",
-"Submit" => "Envoyer",
 "Sorry, this link doesn’t seem to work anymore." => "Désolé, mais le lien semble ne plus fonctionner.",
 "Reasons might be:" => "Les raisons peuvent être :",
 "the item was removed" => "l'item a été supprimé",
diff --git a/apps/files_sharing/l10n/gl.php b/apps/files_sharing/l10n/gl.php
index 66b1f0e5ffce5aefa5e9e4fa23836c76c4abe83e..c58199ffdb57f9475343263e45bbafcad0a7bfd4 100644
--- a/apps/files_sharing/l10n/gl.php
+++ b/apps/files_sharing/l10n/gl.php
@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"This share is password-protected" => "Esta compartición está protexida con contrasinal",
 "The password is wrong. Try again." => "O contrasinal é incorrecto. Ténteo de novo.",
 "Password" => "Contrasinal",
-"Submit" => "Enviar",
 "Sorry, this link doesn’t seem to work anymore." => "Semella que esta ligazón non funciona.",
 "Reasons might be:" => "As razóns poderían ser:",
 "the item was removed" => "o elemento foi retirado",
diff --git a/apps/files_sharing/l10n/he.php b/apps/files_sharing/l10n/he.php
index f8b304898ce75dda95ca1b0c24f28e0387d17a9a..217298feddf87a5c27e1340b3129815f068c3eb2 100644
--- a/apps/files_sharing/l10n/he.php
+++ b/apps/files_sharing/l10n/he.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "סיסמא",
-"Submit" => "שליחה",
 "%s shared the folder %s with you" => "%s שיתף עמך את התיקייה %s",
 "%s shared the file %s with you" => "%s שיתף עמך את הקובץ %s",
 "Download" => "הורדה",
diff --git a/apps/files_sharing/l10n/hr.php b/apps/files_sharing/l10n/hr.php
index 87eb9567067f2df42fbbaea6bd149c5e7adeb44f..4a82dd7f71f475fe0fcb0f2c2460d59349764f70 100644
--- a/apps/files_sharing/l10n/hr.php
+++ b/apps/files_sharing/l10n/hr.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Lozinka",
-"Submit" => "Pošalji",
 "Download" => "Preuzimanje",
 "Upload" => "Učitaj",
 "Cancel upload" => "Prekini upload"
diff --git a/apps/files_sharing/l10n/hu_HU.php b/apps/files_sharing/l10n/hu_HU.php
index 7ef69b1e0b67cb7a9a70bada4807c0f8f91918b6..423af30aaeb1d0dd41201676448c69512c2afbaa 100644
--- a/apps/files_sharing/l10n/hu_HU.php
+++ b/apps/files_sharing/l10n/hu_HU.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "A megadott jelszó nem megfelelő. Próbálja újra!",
 "Password" => "Jelszó",
-"Submit" => "Elküld",
 "Sorry, this link doesn’t seem to work anymore." => "Sajnos úgy tűnik, ez a link már nem működik.",
 "Reasons might be:" => "Ennek az oka a következő lehet:",
 "the item was removed" => "az állományt időközben eltávolították",
diff --git a/apps/files_sharing/l10n/hy.php b/apps/files_sharing/l10n/hy.php
index d4cb416f45a895f0c390032f0445d94956955488..da200623e03e62dfffc18bcda6749d853ce77928 100644
--- a/apps/files_sharing/l10n/hy.php
+++ b/apps/files_sharing/l10n/hy.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Submit" => "Հաստատել",
 "Download" => "Բեռնել"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ia.php b/apps/files_sharing/l10n/ia.php
index 5112501073d965f6d1603eec60d9b855238936cc..f9d6c33a0b5127b2e6784d74d00e654a5821078a 100644
--- a/apps/files_sharing/l10n/ia.php
+++ b/apps/files_sharing/l10n/ia.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Contrasigno",
-"Submit" => "Submitter",
 "Download" => "Discargar",
 "Upload" => "Incargar"
 );
diff --git a/apps/files_sharing/l10n/id.php b/apps/files_sharing/l10n/id.php
index a4d73bd2b7527df7f490ba4b671aff7692dd42a0..e91ef94bf385a4e7f49039cb0da9f93d1f972bb3 100644
--- a/apps/files_sharing/l10n/id.php
+++ b/apps/files_sharing/l10n/id.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Sandi",
-"Submit" => "Kirim",
 "%s shared the folder %s with you" => "%s membagikan folder %s dengan Anda",
 "%s shared the file %s with you" => "%s membagikan file %s dengan Anda",
 "Download" => "Unduh",
diff --git a/apps/files_sharing/l10n/is.php b/apps/files_sharing/l10n/is.php
index 05241d3f9e6cc8c85ff67bcd6b3ac6193853daf9..8ae8e48eff63882a96616695c4e4caed2bd2a851 100644
--- a/apps/files_sharing/l10n/is.php
+++ b/apps/files_sharing/l10n/is.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Lykilorð",
-"Submit" => "Senda",
 "%s shared the folder %s with you" => "%s deildi möppunni %s með þér",
 "%s shared the file %s with you" => "%s deildi skránni %s með þér",
 "Download" => "Niðurhal",
diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php
index a611e0641c8c09ca1b06a2ef3682e908fef4d14a..c5d4a4db3ec37d8fbc699475ab9d0911167c6852 100644
--- a/apps/files_sharing/l10n/it.php
+++ b/apps/files_sharing/l10n/it.php
@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"This share is password-protected" => "Questa condivione è protetta da password",
 "The password is wrong. Try again." => "La password è errata. Prova ancora.",
 "Password" => "Password",
-"Submit" => "Invia",
 "Sorry, this link doesn’t seem to work anymore." => "Spiacenti, questo collegamento sembra non essere più attivo.",
 "Reasons might be:" => "I motivi potrebbero essere:",
 "the item was removed" => "l'elemento è stato rimosso",
diff --git a/apps/files_sharing/l10n/ja_JP.php b/apps/files_sharing/l10n/ja_JP.php
index 4f7d5b31c2f70792133008f3a0b57128bd0173ed..6a7500f147fb22f8d82fbbce331825c43eeaddfb 100644
--- a/apps/files_sharing/l10n/ja_JP.php
+++ b/apps/files_sharing/l10n/ja_JP.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "パスワードが間違っています。再試行してください。",
 "Password" => "パスワード",
-"Submit" => "送信",
 "Sorry, this link doesn’t seem to work anymore." => "申し訳ございません。このリンクはもう利用できません。",
 "Reasons might be:" => "理由は以下の通りと考えられます:",
 "the item was removed" => "アイテムが削除されました",
diff --git a/apps/files_sharing/l10n/ka_GE.php b/apps/files_sharing/l10n/ka_GE.php
index a5a80b3c5a19a931ea15fae0ba861248f806d286..89a6800b3e4cfdecddec6d6737e3936ea6ed166c 100644
--- a/apps/files_sharing/l10n/ka_GE.php
+++ b/apps/files_sharing/l10n/ka_GE.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "პაროლი",
-"Submit" => "გაგზავნა",
 "%s shared the folder %s with you" => "%s–მა გაგიზიარათ ფოლდერი %s",
 "%s shared the file %s with you" => "%s–მა გაგიზიარათ ფაილი %s",
 "Download" => "ჩამოტვირთვა",
diff --git a/apps/files_sharing/l10n/ko.php b/apps/files_sharing/l10n/ko.php
index f7eab1ac5500c2e6169c33ddeba0f9a0be7a85aa..90f59ed167325fa65fc07dbaab8781607502a64f 100644
--- a/apps/files_sharing/l10n/ko.php
+++ b/apps/files_sharing/l10n/ko.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "비밀번호가 틀립니다. 다시 입력해주세요.",
 "Password" => "암호",
-"Submit" => "제출",
 "Sorry, this link doesn’t seem to work anymore." => "죄송합니다만 이 링크는 더이상 작동되지 않습니다.",
 "Reasons might be:" => "이유는 다음과 같을 수 있습니다:",
 "the item was removed" => "이 항목은 삭제되었습니다",
diff --git a/apps/files_sharing/l10n/ku_IQ.php b/apps/files_sharing/l10n/ku_IQ.php
index 55576a19c36d797a1723cb4c67bd8da8a28ce287..6b4b7e4ba9e33d54087c50472e642d4db74d1db8 100644
--- a/apps/files_sharing/l10n/ku_IQ.php
+++ b/apps/files_sharing/l10n/ku_IQ.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "وشەی تێپەربو",
-"Submit" => "ناردن",
 "%s shared the folder %s with you" => "%s دابه‌شی کردووه‌ بوخچه‌ی %s له‌گه‌ڵ تۆ",
 "%s shared the file %s with you" => "%s دابه‌شی کردووه‌ په‌ڕگه‌یی %s له‌گه‌ڵ تۆ",
 "Download" => "داگرتن",
diff --git a/apps/files_sharing/l10n/lb.php b/apps/files_sharing/l10n/lb.php
index d37a1d9d22a35b75c0a757520c549c8f9c7e0c54..eeb6a3e2dca66b6afd9b26dc5dbdf07e16fe5c60 100644
--- a/apps/files_sharing/l10n/lb.php
+++ b/apps/files_sharing/l10n/lb.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Den Passwuert ass incorrect. Probeier ed nach eng keier.",
 "Password" => "Passwuert",
-"Submit" => "Fortschécken",
 "%s shared the folder %s with you" => "%s huet den Dossier %s mad der gedeelt",
 "%s shared the file %s with you" => "%s deelt den Fichier %s mad dir",
 "Download" => "Download",
diff --git a/apps/files_sharing/l10n/lt_LT.php b/apps/files_sharing/l10n/lt_LT.php
index 90ae6a39a074378f25e6ae33d84cc8079bd58d21..fe4a82e06431e31bd23c37bf76489b1803a707f7 100644
--- a/apps/files_sharing/l10n/lt_LT.php
+++ b/apps/files_sharing/l10n/lt_LT.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Netinka slaptažodis: Bandykite dar kartą.",
 "Password" => "Slaptažodis",
-"Submit" => "Išsaugoti",
 "Sorry, this link doesn’t seem to work anymore." => "Atleiskite, panašu, kad nuoroda yra neveiksni.",
 "Reasons might be:" => "Galimos priežastys:",
 "the item was removed" => "elementas buvo pašalintas",
diff --git a/apps/files_sharing/l10n/lv.php b/apps/files_sharing/l10n/lv.php
index 0eb04fb966f34744d712a922116d2dec18355b66..a913ba1152583ab378f5fc40b549662f7f616d8c 100644
--- a/apps/files_sharing/l10n/lv.php
+++ b/apps/files_sharing/l10n/lv.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Parole",
-"Submit" => "Iesniegt",
 "%s shared the folder %s with you" => "%s ar jums dalījās ar mapi %s",
 "%s shared the file %s with you" => "%s ar jums dalījās ar datni %s",
 "Download" => "Lejupielādēt",
diff --git a/apps/files_sharing/l10n/mk.php b/apps/files_sharing/l10n/mk.php
index c913b2beaf74494e6dfe22e3c5774cbac3250311..c132f7aa26598890b9733418258e8759a85620a5 100644
--- a/apps/files_sharing/l10n/mk.php
+++ b/apps/files_sharing/l10n/mk.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Лозинка",
-"Submit" => "Прати",
 "%s shared the folder %s with you" => "%s ја сподели папката %s со Вас",
 "%s shared the file %s with you" => "%s ја сподели датотеката %s со Вас",
 "Download" => "Преземи",
diff --git a/apps/files_sharing/l10n/ms_MY.php b/apps/files_sharing/l10n/ms_MY.php
index 0a3d08bbc176d341a836176dd7de39a0d5dd9ee0..9725dd4d1bc081c140adaa14fadccb78c7bfe70e 100644
--- a/apps/files_sharing/l10n/ms_MY.php
+++ b/apps/files_sharing/l10n/ms_MY.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Kata laluan",
-"Submit" => "Hantar",
 "Download" => "Muat turun",
 "Upload" => "Muat naik",
 "Cancel upload" => "Batal muat naik"
diff --git a/apps/files_sharing/l10n/my_MM.php b/apps/files_sharing/l10n/my_MM.php
index f44010004cdb04c290cf23b461e454370eac0ab1..ff92e898ed44929ee8779f3356dd72bc55cb9abb 100644
--- a/apps/files_sharing/l10n/my_MM.php
+++ b/apps/files_sharing/l10n/my_MM.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "စကားဝှက်",
-"Submit" => "ထည့်သွင်းမည်",
 "Download" => "ဒေါင်းလုတ်"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/nb_NO.php b/apps/files_sharing/l10n/nb_NO.php
index dd8a8edf31388bd0d34fb8e43c3b3cf4076fc8ff..0452b5275c18ee0738669129cee1532c8998cc70 100644
--- a/apps/files_sharing/l10n/nb_NO.php
+++ b/apps/files_sharing/l10n/nb_NO.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Passordet er feil. Prøv på nytt.",
 "Password" => "Passord",
-"Submit" => "Send inn",
 "%s shared the folder %s with you" => "%s delte mappen %s med deg",
 "%s shared the file %s with you" => "%s delte filen %s med deg",
 "Download" => "Last ned",
diff --git a/apps/files_sharing/l10n/nl.php b/apps/files_sharing/l10n/nl.php
index 9c46a1ab4b3225a5efa80674fd87eb8d8f68de15..ed9f867fdc35bfaefa749b2380f291ebeaebb3e0 100644
--- a/apps/files_sharing/l10n/nl.php
+++ b/apps/files_sharing/l10n/nl.php
@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"This share is password-protected" => "Deze share is met een wachtwoord beveiligd",
 "The password is wrong. Try again." => "Wachtwoord ongeldig. Probeer het nogmaals.",
 "Password" => "Wachtwoord",
-"Submit" => "Verzenden",
 "Sorry, this link doesn’t seem to work anymore." => "Sorry, deze link lijkt niet meer in gebruik te zijn.",
 "Reasons might be:" => "Redenen kunnen zijn:",
 "the item was removed" => "bestand was verwijderd",
diff --git a/apps/files_sharing/l10n/nn_NO.php b/apps/files_sharing/l10n/nn_NO.php
index 94272943e40b9606c30a56bd7226363d307379cc..1f1e8001e701bdd96fbbf4db5cb4ca329b1dd6fd 100644
--- a/apps/files_sharing/l10n/nn_NO.php
+++ b/apps/files_sharing/l10n/nn_NO.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Passordet er gale. Prøv igjen.",
 "Password" => "Passord",
-"Submit" => "Send",
 "Sorry, this link doesn’t seem to work anymore." => "Orsak, denne lenkja fungerer visst ikkje lenger.",
 "Reasons might be:" => "Moglege grunnar:",
 "the item was removed" => "fila/mappa er fjerna",
diff --git a/apps/files_sharing/l10n/oc.php b/apps/files_sharing/l10n/oc.php
index 493ddb4dfd3d31b038654563bbecca48ee16ab28..299d98e58b4eb17678bf366c70b065c3158acc5d 100644
--- a/apps/files_sharing/l10n/oc.php
+++ b/apps/files_sharing/l10n/oc.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Senhal",
-"Submit" => "Sosmetre",
 "Download" => "Avalcarga",
 "Upload" => "Amontcarga",
 "Cancel upload" => " Anulla l'amontcargar"
diff --git a/apps/files_sharing/l10n/pl.php b/apps/files_sharing/l10n/pl.php
index 43c7e2e31447d69a92ecbccf4f37b96fb5d869f7..63d373917e54efa90250675a7bc5e6213519f3ed 100644
--- a/apps/files_sharing/l10n/pl.php
+++ b/apps/files_sharing/l10n/pl.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "To hasło jest niewłaściwe. Spróbuj ponownie.",
 "Password" => "Hasło",
-"Submit" => "Wyślij",
 "Sorry, this link doesn’t seem to work anymore." => "Przepraszamy ale wygląda na to, że ten link już nie działa.",
 "Reasons might be:" => "Możliwe powody:",
 "the item was removed" => "element został usunięty",
diff --git a/apps/files_sharing/l10n/pt_BR.php b/apps/files_sharing/l10n/pt_BR.php
index 9fc1cacf7cbddcc42dc45a312d4dc497e3488fde..a0cc058ca2f23ff3dd8c39b3ae1e34db0939bae0 100644
--- a/apps/files_sharing/l10n/pt_BR.php
+++ b/apps/files_sharing/l10n/pt_BR.php
@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"This share is password-protected" => "Este compartilhamento esta protegido por senha",
 "The password is wrong. Try again." => "Senha incorreta. Tente novamente.",
 "Password" => "Senha",
-"Submit" => "Submeter",
 "Sorry, this link doesn’t seem to work anymore." => "Desculpe, este link parece não mais  funcionar.",
 "Reasons might be:" => "As razões podem ser:",
 "the item was removed" => "o item foi removido",
diff --git a/apps/files_sharing/l10n/pt_PT.php b/apps/files_sharing/l10n/pt_PT.php
index 73dc2a3e1f35f742a803c79cb126d29da36d6c27..7fa1876aaac2ec15365a62a07e2b14c0d273fed3 100644
--- a/apps/files_sharing/l10n/pt_PT.php
+++ b/apps/files_sharing/l10n/pt_PT.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Password errada, por favor tente de novo",
 "Password" => "Password",
-"Submit" => "Submeter",
 "Sorry, this link doesn’t seem to work anymore." => "Desculpe, mas este link parece não estar a funcionar.",
 "Reasons might be:" => "As razões poderão ser:",
 "the item was removed" => "O item foi removido",
diff --git a/apps/files_sharing/l10n/ro.php b/apps/files_sharing/l10n/ro.php
index d17152ff1b1b300f5cb1a39de7389448b8c096ab..54e20ed6bb4f6b203ec80190bd795bf0d456f974 100644
--- a/apps/files_sharing/l10n/ro.php
+++ b/apps/files_sharing/l10n/ro.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Parola este incorectă. Încercaţi din nou.",
 "Password" => "Parolă",
-"Submit" => "Trimite",
 "%s shared the folder %s with you" => "%s a partajat directorul %s cu tine",
 "%s shared the file %s with you" => "%s a partajat fișierul %s cu tine",
 "Download" => "Descarcă",
diff --git a/apps/files_sharing/l10n/ru.php b/apps/files_sharing/l10n/ru.php
index f42f1d9aeb6af6cac2b77168b4d258322787a6ed..38581b045e631ddd8f4a14c4f96b3673085387b9 100644
--- a/apps/files_sharing/l10n/ru.php
+++ b/apps/files_sharing/l10n/ru.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Неверный пароль. Попробуйте еще раз.",
 "Password" => "Пароль",
-"Submit" => "Отправить",
 "Sorry, this link doesn’t seem to work anymore." => "К сожалению, эта ссылка, похоже не будет работать больше.",
 "Reasons might be:" => "Причиной может быть:",
 "the item was removed" => "объект был удалён",
diff --git a/apps/files_sharing/l10n/si_LK.php b/apps/files_sharing/l10n/si_LK.php
index 6135f09213968e899ccfb91531fb17af32a8a381..e8401385647c25ef9dd4bad4e12c850075df5d8a 100644
--- a/apps/files_sharing/l10n/si_LK.php
+++ b/apps/files_sharing/l10n/si_LK.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "මුර පදය",
-"Submit" => "යොමු කරන්න",
 "%s shared the folder %s with you" => "%s ඔබව %s ෆෝල්ඩරයට හවුල් කරගත්තේය",
 "%s shared the file %s with you" => "%s ඔබ සමඟ %s ගොනුව බෙදාහදාගත්තේය",
 "Download" => "බාන්න",
diff --git a/apps/files_sharing/l10n/sk_SK.php b/apps/files_sharing/l10n/sk_SK.php
index 31ecb28b602f113ab6391df502ee45637a7911fd..d8633c1daf103d212e27e6e25815b9dca21cd591 100644
--- a/apps/files_sharing/l10n/sk_SK.php
+++ b/apps/files_sharing/l10n/sk_SK.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Heslo je chybné. Skúste to znova.",
 "Password" => "Heslo",
-"Submit" => "Odoslať",
 "Sorry, this link doesn’t seem to work anymore." => "To je nepríjemné, ale tento odkaz už nie je funkčný.",
 "Reasons might be:" => "Možné dôvody:",
 "the item was removed" => "položka bola presunutá",
diff --git a/apps/files_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php
index cbd4f5fea2234b4262c28e0f856e0252dab73c95..58bbf87c19f94e3a7d98a44e5f710cbbeedd5816 100644
--- a/apps/files_sharing/l10n/sl.php
+++ b/apps/files_sharing/l10n/sl.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Geslo",
-"Submit" => "Pošlji",
 "%s shared the folder %s with you" => "Oseba %s je določila mapo %s za souporabo",
 "%s shared the file %s with you" => "Oseba %s je določila datoteko %s za souporabo",
 "Download" => "Prejmi",
diff --git a/apps/files_sharing/l10n/sq.php b/apps/files_sharing/l10n/sq.php
index d2077663e8d7bef61be1aa4a445f6623226492d1..473049f75edaf4af2605b80cf43942db3b0fa9bc 100644
--- a/apps/files_sharing/l10n/sq.php
+++ b/apps/files_sharing/l10n/sq.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Kodi është i gabuar. Provojeni përsëri.",
 "Password" => "Kodi",
-"Submit" => "Parashtro",
 "Sorry, this link doesn’t seem to work anymore." => "Ju kërkojmë ndjesë, kjo lidhje duket sikur nuk punon më.",
 "Reasons might be:" => "Arsyet mund të jenë:",
 "the item was removed" => "elementi është eliminuar",
diff --git a/apps/files_sharing/l10n/sr.php b/apps/files_sharing/l10n/sr.php
index 3b97d15419a117e84b76619299eab7ea60e8841f..e484ad25eb675252a8e9c2baa883dbdec0101fee 100644
--- a/apps/files_sharing/l10n/sr.php
+++ b/apps/files_sharing/l10n/sr.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Лозинка",
-"Submit" => "Пошаљи",
 "Download" => "Преузми",
 "Upload" => "Отпреми",
 "Cancel upload" => "Прекини отпремање"
diff --git a/apps/files_sharing/l10n/sr@latin.php b/apps/files_sharing/l10n/sr@latin.php
index 1a6be6257616931897ee0fdc389ae857264ab058..08463e151036f2ef8c4147ad47165f4de97b7d59 100644
--- a/apps/files_sharing/l10n/sr@latin.php
+++ b/apps/files_sharing/l10n/sr@latin.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Lozinka",
-"Submit" => "Pošalji",
 "Download" => "Preuzmi",
 "Upload" => "Pošalji"
 );
diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php
index b8a5f8629a6ef8b3a2d13df1efa4bfbd5ab707da..23bf17aba450ad7022aea4ed920a3e68a5cc3962 100644
--- a/apps/files_sharing/l10n/sv.php
+++ b/apps/files_sharing/l10n/sv.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Lösenordet är fel. Försök igen.",
 "Password" => "Lösenord",
-"Submit" => "Skicka",
 "Sorry, this link doesn’t seem to work anymore." => "Tyvärr, denna länk verkar inte fungera längre.",
 "Reasons might be:" => "Orsaker kan vara:",
 "the item was removed" => "objektet togs bort",
diff --git a/apps/files_sharing/l10n/ta_LK.php b/apps/files_sharing/l10n/ta_LK.php
index b4eb0fb7fb84914ce945a9220d6aafdefa541ab1..90a2fb417f42d4f5735cd35897d49f34a696bd29 100644
--- a/apps/files_sharing/l10n/ta_LK.php
+++ b/apps/files_sharing/l10n/ta_LK.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "கடவுச்சொல்",
-"Submit" => "சமர்ப்பிக்குக",
 "%s shared the folder %s with you" => "%s கோப்புறையானது %s உடன் பகிரப்பட்டது",
 "%s shared the file %s with you" => "%s கோப்பானது %s உடன் பகிரப்பட்டது",
 "Download" => "பதிவிறக்குக",
diff --git a/apps/files_sharing/l10n/th_TH.php b/apps/files_sharing/l10n/th_TH.php
index 060bd8bed9472307fa6733aafde4108818138e0b..e192e0a97cdefedd8f46224db608ad1c8d707154 100644
--- a/apps/files_sharing/l10n/th_TH.php
+++ b/apps/files_sharing/l10n/th_TH.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "รหัสผ่าน",
-"Submit" => "ส่ง",
 "%s shared the folder %s with you" => "%s ได้แชร์โฟลเดอร์ %s ให้กับคุณ",
 "%s shared the file %s with you" => "%s ได้แชร์ไฟล์ %s ให้กับคุณ",
 "Download" => "ดาวน์โหลด",
diff --git a/apps/files_sharing/l10n/tr.php b/apps/files_sharing/l10n/tr.php
index a5bcff82cf333989387942ca40546049e12352ca..9a2d36e5236cfc095198a5785d7288c612a4e3a4 100644
--- a/apps/files_sharing/l10n/tr.php
+++ b/apps/files_sharing/l10n/tr.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Parola",
-"Submit" => "Gönder",
 "%s shared the folder %s with you" => "%s sizinle paylaşılan  %s klasör",
 "%s shared the file %s with you" => "%s sizinle paylaşılan  %s klasör",
 "Download" => "İndir",
diff --git a/apps/files_sharing/l10n/ug.php b/apps/files_sharing/l10n/ug.php
index 43ee9f77bcd8198244163019ca3323bb82d3bfdb..6ffa02f7344a0ff8f024f72f5971ce0c4731ff21 100644
--- a/apps/files_sharing/l10n/ug.php
+++ b/apps/files_sharing/l10n/ug.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "ئىم",
-"Submit" => "تاپشۇر",
 "Download" => "چۈشۈر",
 "Upload" => "يۈكلە",
 "Cancel upload" => "يۈكلەشتىن ۋاز كەچ"
diff --git a/apps/files_sharing/l10n/uk.php b/apps/files_sharing/l10n/uk.php
index b6a7784c6908ccb1cc16a2f53e3afa98262b4f08..dea1ee68507cc329ecf92046d76e4c5c3177d0ff 100644
--- a/apps/files_sharing/l10n/uk.php
+++ b/apps/files_sharing/l10n/uk.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Пароль",
-"Submit" => "Передати",
 "%s shared the folder %s with you" => "%s опублікував каталог %s для Вас",
 "%s shared the file %s with you" => "%s опублікував файл %s для Вас",
 "Download" => "Завантажити",
diff --git a/apps/files_sharing/l10n/vi.php b/apps/files_sharing/l10n/vi.php
index 00e8e094c367ded734e2e3b9c352e6f78e678e42..4566d3744de956b59ff78dad4ab5433a4f49419a 100644
--- a/apps/files_sharing/l10n/vi.php
+++ b/apps/files_sharing/l10n/vi.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Mật khẩu",
-"Submit" => "Xác nhận",
 "%s shared the folder %s with you" => "%s đã chia sẻ thư mục %s với bạn",
 "%s shared the file %s with you" => "%s đã chia sẻ tập tin %s với bạn",
 "Download" => "Tải về",
diff --git a/apps/files_sharing/l10n/zh_CN.php b/apps/files_sharing/l10n/zh_CN.php
index f541d6c155a391c8ee81ab7c5248506f8c8e1708..956c161b48eb2fdd612c357af07eb522d2f7fa08 100644
--- a/apps/files_sharing/l10n/zh_CN.php
+++ b/apps/files_sharing/l10n/zh_CN.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "用户名或密码错误!请重试",
 "Password" => "密码",
-"Submit" => "提交",
 "Sorry, this link doesn’t seem to work anymore." => "抱歉,此链接已失效",
 "Reasons might be:" => "可能原因是:",
 "the item was removed" => "此项已移除",
diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php
index 5cc33fd3830c5c7eadeea8b63947e246e2500d54..bc415913e4b261997b44c8b834439537ca9906b4 100644
--- a/apps/files_sharing/l10n/zh_TW.php
+++ b/apps/files_sharing/l10n/zh_TW.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "請檢查您的密碼並再試一次",
 "Password" => "密碼",
-"Submit" => "送出",
 "Sorry, this link doesn’t seem to work anymore." => "抱歉,此連結已經失效",
 "Reasons might be:" => "可能的原因:",
 "the item was removed" => "項目已經移除",
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index eff38dcc0fd5fce37baf3d39ae3206381d1cfdfa..8bdbc8524e6dfc483e38f8b27a32944eb920ec65 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -77,6 +77,7 @@ if (isset($path)) {
 				$hasher = new PasswordHash(8, $forcePortable);
 				if (!($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''),
 											 $linkItem['share_with']))) {
+					OCP\Util::addStyle('files_sharing', 'authenticate');
 					$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
 					$tmpl->assign('URL', $url);
 					$tmpl->assign('wrongpw', true);
@@ -101,6 +102,7 @@ if (isset($path)) {
 				|| \OC::$session->get('public_link_authenticated') !== $linkItem['id']
 			) {
 				// Prompt for password
+				OCP\Util::addStyle('files_sharing', 'authenticate');
 				$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
 				$tmpl->assign('URL', $url);
 				$tmpl->printPage();
diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php
index 2c89b5df3f6a5a90a4d99bb618d534225cf3fb2d..6b98e6c9f34aeaa7c7c6fe371656613648d29009 100644
--- a/apps/files_sharing/templates/authenticate.php
+++ b/apps/files_sharing/templates/authenticate.php
@@ -1,12 +1,15 @@
 <form action="<?php p($_['URL']); ?>" method="post">
 	<fieldset>
+		<?php if (!isset($_['wrongpw'])): ?>
+			<div class="warning-info"><?php p($l->t('This share is password-protected')); ?></div>
+		<?php endif; ?>
 		<?php if (isset($_['wrongpw'])): ?>
-		<div class="warning"><?php p($l->t('The password is wrong. Try again.')); ?></div>
+			<div class="warning"><?php p($l->t('The password is wrong. Try again.')); ?></div>
 		<?php endif; ?>
 		<p class="infield">
 			<label for="password" class="infield"><?php p($l->t('Password')); ?></label>
 			<input type="password" name="password" id="password" placeholder="" value="" autofocus />
-			<input type="submit" value="<?php p($l->t('Submit')); ?>" />
+			<input type="submit" value="" class="svg" />
 		</p>
 	</fieldset>
 </form>
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index e53887c35902b4e3c7e996cebdc379070900e64c..5d935f645e692bf77b4bbce1c198ffa1e362a6ca 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -2,6 +2,7 @@
 	<div id="notification" style="display: none;"></div>
 </div>
 
+<input type="hidden" id="filesApp" name="filesApp" value="1">
 <input type="hidden" id="isPublic" name="isPublic" value="1">
 <input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
 <input type="hidden" name="downloadURL" value="<?php p($_['downloadURL']) ?>" id="downloadURL">
diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index c55c186f089a92787df0b21129307b4e8e640971..9452dd37707fe2b98b87f28768455e5409e49ca1 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -58,6 +58,10 @@ class Test_Files_Sharing_Api extends \PHPUnit_Framework_TestCase {
 	}
 
 	function setUp() {
+
+		//login as user1
+		\Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1);
+
 		$this->data = 'foobar';
 		$this->view = new \OC_FilesystemView('/' . \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1 . '/files');
 
@@ -104,9 +108,6 @@ class Test_Files_Sharing_Api extends \PHPUnit_Framework_TestCase {
 	 */
 	function testCreateShare() {
 
-		//login as user1
-		\Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1);
-
 		// share to user
 
 		// simulate a post request
@@ -295,7 +296,8 @@ class Test_Files_Sharing_Api extends \PHPUnit_Framework_TestCase {
 		$result = Share\Api::getShare($params);
 
 		$this->assertEquals(404, $result->getStatusCode());
-		$this->assertEquals('share doesn\'t exist', $result->getMeta()['message']);
+        $meta = $result->getMeta();
+		$this->assertEquals('share doesn\'t exist', $meta['message']);
 
 	}
 
@@ -351,7 +353,8 @@ class Test_Files_Sharing_Api extends \PHPUnit_Framework_TestCase {
 
 		$result = Share\Api::updateShare($params);
 
-		$this->assertTrue($result->succeeded(), $result->getMeta()['message']);
+        $meta = $result->getMeta();
+		$this->assertTrue($result->succeeded(), $meta['message']);
 
 		$items = \OCP\Share::getItemShared('file', $userShare['file_source']);
 
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index d8661e170a58cd69ebde886cb0fa92192969916f..d079af3fb6d185ddf58bf3dfa7a840cedac18995 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -5,7 +5,6 @@ OCP\User::checkLoggedIn();
 
 OCP\App::setActiveNavigationEntry('files_index');
 
-OCP\Util::addScript('files_trashbin', 'trash');
 OCP\Util::addScript('files_trashbin', 'disableDefaultActions');
 OCP\Util::addScript('files', 'fileactions');
 $tmpl = new OCP\Template('files_trashbin', 'index', 'user');
@@ -15,6 +14,7 @@ OCP\Util::addScript('files', 'filelist');
 // filelist overrides
 OCP\Util::addScript('files_trashbin', 'filelist');
 OCP\Util::addscript('files', 'files');
+OCP\Util::addScript('files_trashbin', 'trash');
 
 $dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
 
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index d73eadb6011d40ac73797b617e4e26bb493e5c45..4e83afcdb06f3b67eac9c05707bc685ef83e8e45 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -3,15 +3,39 @@ $(document).ready(function() {
 
 	if (typeof FileActions !== 'undefined') {
 		FileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/history'), function(filename) {
-			var tr=$('tr').filterAttr('data-file', filename);
-			var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
-			var undeleteAction = $('tr').filterAttr('data-file',filename).children("td.date");
-			var files = tr.attr('data-file');
-			undeleteAction[0].innerHTML = undeleteAction[0].innerHTML+spinner;
+			var tr = $('tr').filterAttr('data-file', filename);
+			var deleteAction = $('tr').filterAttr('data-file', filename).children("td.date").children(".action.delete");
+			deleteAction.removeClass('delete-icon').addClass('progress-icon');
 			disableActions();
-			$.post(OC.filePath('files_trashbin','ajax','undelete.php'),
-				{files:JSON.stringify([files]), dirlisting:tr.attr('data-dirlisting') },
-				function(result){
+			$.post(OC.filePath('files_trashbin', 'ajax', 'undelete.php'),
+					{files: JSON.stringify([filename]), dirlisting: tr.attr('data-dirlisting')},
+					function(result) {
+						for (var i = 0; i < result.data.success.length; i++) {
+							var row = document.getElementById(result.data.success[i].filename);
+							row.parentNode.removeChild(row);
+						}
+						if (result.status !== 'success') {
+							OC.dialogs.alert(result.data.message, t('core', 'Error'));
+						}
+						enableActions();
+						FileList.updateFileSummary();
+					}
+			);
+
+		});
+	};
+
+	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");
+		deleteAction.removeClass('delete-icon').addClass('progress-icon');
+		disableActions();
+		$.post(OC.filePath('files_trashbin', 'ajax', 'delete.php'),
+				{files: JSON.stringify([filename]), dirlisting: tr.attr('data-dirlisting')},
+				function(result) {
 					for (var i = 0; i < result.data.success.length; i++) {
 						var row = document.getElementById(result.data.success[i].filename);
 						row.parentNode.removeChild(row);
@@ -21,26 +45,74 @@ $(document).ready(function() {
 					}
 					enableActions();
 					FileList.updateFileSummary();
-				});
+				}
+		);
 
-			});
-		};
+	});
 
-		FileActions.register('all', 'Delete', OC.PERMISSION_READ, function () {
-			return OC.imagePath('core', 'actions/delete');
-		}, function (filename) {
-			$('.tipsy').remove();
+	// Sets the select_all checkbox behaviour :
+	$('#select_all').click(function() {
+		if ($(this).attr('checked')) {
+			// Check all
+			$('td.filename input:checkbox').attr('checked', true);
+			$('td.filename input:checkbox').parent().parent().addClass('selected');
+		} else {
+			// Uncheck all
+			$('td.filename input:checkbox').attr('checked', false);
+			$('td.filename input:checkbox').parent().parent().removeClass('selected');
+		}
+		procesSelection();
+	});
 
-			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>';
-			var files = tr.attr('data-file');
-			deleteAction[0].outerHTML = newHTML;
-			disableActions();
-			$.post(OC.filePath('files_trashbin','ajax','delete.php'),
-				{files:JSON.stringify([files]), dirlisting:tr.attr('data-dirlisting') },
-				function(result){
+	$('#fileList').on('click', 'td.filename a', function(event) {
+		if (event.shiftKey) {
+			event.preventDefault();
+			var last = $(lastChecked).parent().parent().prevAll().length;
+			var first = $(this).parent().parent().prevAll().length;
+			var start = Math.min(first, last);
+			var end = Math.max(first, last);
+			var rows = $(this).parent().parent().parent().children('tr');
+			for (var i = start; i < end; i++) {
+				$(rows).each(function(index) {
+					if (index == i) {
+						var checkbox = $(this).children().children('input:checkbox');
+						$(checkbox).attr('checked', 'checked');
+						$(checkbox).parent().parent().addClass('selected');
+					}
+				});
+			}
+		}
+		var checkbox = $(this).parent().children('input:checkbox');
+		lastChecked = checkbox;
+		if ($(checkbox).attr('checked')) {
+			$(checkbox).removeAttr('checked');
+			$(checkbox).parent().parent().removeClass('selected');
+			$('#select_all').removeAttr('checked');
+		} else {
+			$(checkbox).attr('checked', 'checked');
+			$(checkbox).parent().parent().toggleClass('selected');
+			var selectedCount = $('td.filename input:checkbox:checked').length;
+			if (selectedCount == $('td.filename input:checkbox').length) {
+				$('#select_all').attr('checked', 'checked');
+			}
+		}
+		procesSelection();
+	});
+
+	$('.undelete').click('click', function(event) {
+		event.preventDefault();
+		var files = getSelectedFiles('file');
+		var fileslist = JSON.stringify(files);
+		var dirlisting = getSelectedFiles('dirlisting')[0];
+		disableActions();
+		for (var i = 0; i < files.length; i++) {
+			var deleteAction = $('tr').filterAttr('data-file', files[i]).children("td.date").children(".action.delete");
+			deleteAction.removeClass('delete-icon').addClass('progress-icon');
+		}
+
+		$.post(OC.filePath('files_trashbin', 'ajax', 'undelete.php'),
+				{files: fileslist, dirlisting: dirlisting},
+				function(result) {
 					for (var i = 0; i < result.data.success.length; i++) {
 						var row = document.getElementById(result.data.success[i].filename);
 						row.parentNode.removeChild(row);
@@ -50,106 +122,38 @@ $(document).ready(function() {
 					}
 					enableActions();
 					FileList.updateFileSummary();
-				});
-
-			});
-
-		// Sets the select_all checkbox behaviour :
-		$('#select_all').click(function() {
-			if($(this).attr('checked')){
-				// Check all
-				$('td.filename input:checkbox').attr('checked', true);
-				$('td.filename input:checkbox').parent().parent().addClass('selected');
-			}else{
-				// Uncheck all
-				$('td.filename input:checkbox').attr('checked', false);
-				$('td.filename input:checkbox').parent().parent().removeClass('selected');
-			}
-			processSelection();
-		});
-
-		$('td.filename input:checkbox').live('change',function(event) {
-			if (event.shiftKey) {
-				var last = $(lastChecked).parent().parent().prevAll().length;
-				var first = $(this).parent().parent().prevAll().length;
-				var start = Math.min(first, last);
-				var end = Math.max(first, last);
-				var rows = $(this).parent().parent().parent().children('tr');
-				for (var i = start; i < end; i++) {
-					$(rows).each(function(index) {
-						if (index === i) {
-							var checkbox = $(this).children().children('input:checkbox');
-							$(checkbox).attr('checked', 'checked');
-							$(checkbox).parent().parent().addClass('selected');
-						}
-					});
 				}
-			}
-			var selectedCount=$('td.filename input:checkbox:checked').length;
-			$(this).parent().parent().toggleClass('selected');
-			if(!$(this).attr('checked')){
-				$('#select_all').attr('checked',false);
-			}else{
-				if(selectedCount==$('td.filename input:checkbox').length){
-					$('#select_all').attr('checked',true);
-				}
-			}
-			processSelection();
-		});
+		);
+	});
 
-		$('.undelete').click('click',function(event) {
-			event.preventDefault();
-			var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
-			var files=getSelectedFiles('file');
-			var fileslist = JSON.stringify(files);
-			var dirlisting=getSelectedFiles('dirlisting')[0];
-			disableActions();
-			for (var i=0; i<files.length; i++) {
-				var undeleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date");
-				undeleteAction[0].innerHTML = undeleteAction[0].innerHTML+spinner;
-			}
+	$('.delete').click('click', function(event) {
+		event.preventDefault();
+		var files = getSelectedFiles('file');
+		var fileslist = JSON.stringify(files);
+		var dirlisting = getSelectedFiles('dirlisting')[0];
 
-			$.post(OC.filePath('files_trashbin','ajax','undelete.php'),
-					{files:fileslist, dirlisting:dirlisting},
-					function(result){
-						for (var i = 0; i < result.data.success.length; i++) {
-							var row = document.getElementById(result.data.success[i].filename);
-							row.parentNode.removeChild(row);
-						}
-						if (result.status !== 'success') {
-							OC.dialogs.alert(result.data.message, t('core', 'Error'));
-						}
-						enableActions();
-					});
-			});
-
-		$('.delete').click('click',function(event) {
-			event.preventDefault();
-			console.log("delete selected");
-			var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'Delete permanently')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
-			var files=getSelectedFiles('file');
-			var fileslist = JSON.stringify(files);
-			var dirlisting=getSelectedFiles('dirlisting')[0];
+		disableActions();
+		for (var i = 0; i < files.length; i++) {
+			var deleteAction = $('tr').filterAttr('data-file', files[i]).children("td.date").children(".action.delete");
+			deleteAction.removeClass('delete-icon').addClass('progress-icon');
+		}
 
-			disableActions();
-			for (var i=0; i<files.length; i++) {
-				var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date");
-				deleteAction[0].innerHTML = deleteAction[0].innerHTML+spinner;
-			}
+		$.post(OC.filePath('files_trashbin', 'ajax', 'delete.php'),
+				{files: fileslist, dirlisting: dirlisting},
+				function(result) {
+					for (var i = 0; i < result.data.success.length; i++) {
+						var row = document.getElementById(result.data.success[i].filename);
+						row.parentNode.removeChild(row);
+					}
+					if (result.status !== 'success') {
+						OC.dialogs.alert(result.data.message, t('core', 'Error'));
+					}
+					enableActions();
+					FileList.updateFileSummary();
+				}
+		);
 
-			$.post(OC.filePath('files_trashbin','ajax','delete.php'),
-					{files:fileslist, dirlisting:dirlisting},
-					function(result){
-						for (var i = 0; i < result.data.success.length; i++) {
-							var row = document.getElementById(result.data.success[i].filename);
-							row.parentNode.removeChild(row);
-						}
-						if (result.status !== 'success') {
-							OC.dialogs.alert(result.data.message, t('core', 'Error'));
-						}
-						enableActions();
-					});
-			});
+	});
 
 	$('#fileList').on('click', 'td.filename a', function(event) {
 		var mime = $(this).parent().parent().data('mime');
@@ -182,34 +186,6 @@ $(document).ready(function() {
 	};
 });
 
-function processSelection(){
-	var selected=getSelectedFiles();
-	var selectedFiles=selected.filter(function(el){return el.type === 'file'});
-	var selectedFolders=selected.filter(function(el){return el.type === 'dir'});
-	if(selectedFiles.length === 0 && selectedFolders.length === 0) {
-		$('#headerName>span.name').text(t('files','Name'));
-		$('#modified').text(t('files','Deleted'));
-		$('table').removeClass('multiselect');
-		$('.selectedActions').hide();
-	}
-	else {
-		$('.selectedActions').show();
-		var selection='';
-		if(selectedFolders.length>0){
-			selection += n('files', '%n folder', '%n folders', selectedFolders.length);
-			if(selectedFiles.length>0){
-				selection+=' & ';
-			}
-		}
-		if(selectedFiles.length>0){
-			selection += n('files', '%n file', '%n files', selectedFiles.length);
-		}
-		$('#headerName>span.name').text(selection);
-		$('#modified').text('');
-		$('table').addClass('multiselect');
-	}
-}
-
 /**
  * @brief get a list of selected files
  * @param string property (option) the property of the file requested
diff --git a/apps/files_trashbin/l10n/ady.php b/apps/files_trashbin/l10n/ady.php
new file mode 100644
index 0000000000000000000000000000000000000000..0acad00e8b58f9aeba594f70d8957213bf899c9a
--- /dev/null
+++ b/apps/files_trashbin/l10n/ady.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/ar.php b/apps/files_trashbin/l10n/ar.php
index 0af6972af5afcc76d8d94914a0208095130207b9..9733e6b100e35e8a0a73f71b26a7e9155f7c0cb2 100644
--- a/apps/files_trashbin/l10n/ar.php
+++ b/apps/files_trashbin/l10n/ar.php
@@ -2,16 +2,11 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "تعذّر حذف%s بشكل دائم",
 "Couldn't restore %s" => "تعذّر استرجاع %s ",
-"perform restore operation" => "إبدء عملية الإستعادة",
 "Error" => "خطأ",
-"delete file permanently" => "حذف بشكل دائم",
-"Delete permanently" => "حذف بشكل دائم",
-"Name" => "اسم",
-"Deleted" => "تم الحذف",
-"_%n folder_::_%n folders_" => array("","","","","","مجلدات %n"),
-"_%n file_::_%n files_" => array("","","","",""," ملفات %n"),
 "Nothing in here. Your trash bin is empty!" => "لا يوجد شيء هنا. سلة المهملات خاليه.",
+"Name" => "اسم",
 "Restore" => "استعيد",
+"Deleted" => "تم الحذف",
 "Delete" => "إلغاء",
 "Deleted Files" => "الملفات المحذوفه"
 );
diff --git a/apps/files_trashbin/l10n/bg_BG.php b/apps/files_trashbin/l10n/bg_BG.php
index 3c12e6906ed661ef08bed666f120de9f40bc3d0d..2f1521feaa51f7e413ecb2d62881aa749712bb8b 100644
--- a/apps/files_trashbin/l10n/bg_BG.php
+++ b/apps/files_trashbin/l10n/bg_BG.php
@@ -2,16 +2,11 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Невъзможно перманентното изтриване на %s",
 "Couldn't restore %s" => "Невъзможно възтановяване на %s",
-"perform restore operation" => "извършване на действие по възстановяване",
 "Error" => "Грешка",
-"delete file permanently" => "изтриване на файла завинаги",
-"Delete permanently" => "Изтриване завинаги",
-"Name" => "Име",
-"Deleted" => "Изтрито",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Nothing in here. Your trash bin is empty!" => "Няма нищо. Кофата е празна!",
+"Name" => "Име",
 "Restore" => "Възтановяване",
+"Deleted" => "Изтрито",
 "Delete" => "Изтриване",
 "Deleted Files" => "Изтрити файлове"
 );
diff --git a/apps/files_trashbin/l10n/bn_BD.php b/apps/files_trashbin/l10n/bn_BD.php
index c3741dbd1dba4bf49cc903babc1217403cde6c30..d3a9f23b3777e7644fb22df44626bde1189d4ebe 100644
--- a/apps/files_trashbin/l10n/bn_BD.php
+++ b/apps/files_trashbin/l10n/bn_BD.php
@@ -2,8 +2,6 @@
 $TRANSLATIONS = array(
 "Error" => "সমস্যা",
 "Name" => "রাম",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Delete" => "মুছে"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/bs.php b/apps/files_trashbin/l10n/bs.php
index af7033bd1832e7243ab3e19486a21727eeedb32d..08ef9b4fdbbfb656ce8171918b0b73644c6c66d4 100644
--- a/apps/files_trashbin/l10n/bs.php
+++ b/apps/files_trashbin/l10n/bs.php
@@ -1,7 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Name" => "Ime",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","","")
+"Name" => "Ime"
 );
 $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);";
diff --git a/apps/files_trashbin/l10n/ca.php b/apps/files_trashbin/l10n/ca.php
index eb57aa16aa51a955e5c7985d92c54a44c822023e..fa3f63ddb2237c3a6a8327c2bb97f430cae1baa9 100644
--- a/apps/files_trashbin/l10n/ca.php
+++ b/apps/files_trashbin/l10n/ca.php
@@ -2,17 +2,12 @@
 $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ó",
 "Error" => "Error",
-"delete file permanently" => "esborra el fitxer permanentment",
-"Delete permanently" => "Esborra permanentment",
-"Name" => "Nom",
-"Deleted" => "Eliminat",
-"_%n folder_::_%n folders_" => array("","%n carpetes"),
-"_%n file_::_%n files_" => array("","%n fitxers"),
 "restored" => "restaurat",
 "Nothing in here. Your trash bin is empty!" => "La paperera està buida!",
+"Name" => "Nom",
 "Restore" => "Recupera",
+"Deleted" => "Eliminat",
 "Delete" => "Esborra",
 "Deleted Files" => "Fitxers eliminats"
 );
diff --git a/apps/files_trashbin/l10n/cs_CZ.php b/apps/files_trashbin/l10n/cs_CZ.php
index f0bebee742f48de5f4475d3ca9158c71d47101b9..ff0a69572f56ee475949e8c97869d6e0098306ae 100644
--- a/apps/files_trashbin/l10n/cs_CZ.php
+++ b/apps/files_trashbin/l10n/cs_CZ.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nelze trvale odstranit %s",
 "Couldn't restore %s" => "Nelze obnovit %s",
-"perform restore operation" => "provést obnovu",
 "Error" => "Chyba",
-"delete file permanently" => "trvale odstranit soubor",
-"Delete permanently" => "Trvale odstranit",
-"Name" => "Název",
-"Deleted" => "Smazáno",
-"_%n folder_::_%n folders_" => array("%n adresář","%n adresáře","%n adresářů"),
-"_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"),
 "restored" => "obnoveno",
 "Nothing in here. Your trash bin is empty!" => "Žádný obsah. Váš koš je prázdný.",
+"Name" => "Název",
 "Restore" => "Obnovit",
+"Deleted" => "Smazáno",
 "Delete" => "Smazat",
 "Deleted Files" => "Smazané soubory"
 );
diff --git a/apps/files_trashbin/l10n/cy_GB.php b/apps/files_trashbin/l10n/cy_GB.php
index 123a445c2c1d0697a615d2043f0e31b75c12c37f..f2eb81d67d2abba05ea74c439ba57601084de237 100644
--- a/apps/files_trashbin/l10n/cy_GB.php
+++ b/apps/files_trashbin/l10n/cy_GB.php
@@ -2,16 +2,11 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Methwyd dileu %s yn barhaol",
 "Couldn't restore %s" => "Methwyd adfer %s",
-"perform restore operation" => "gweithrediad adfer",
 "Error" => "Gwall",
-"delete file permanently" => "dileu ffeil yn barhaol",
-"Delete permanently" => "Dileu'n barhaol",
-"Name" => "Enw",
-"Deleted" => "Wedi dileu",
-"_%n folder_::_%n folders_" => array("","","",""),
-"_%n file_::_%n files_" => array("","","",""),
 "Nothing in here. Your trash bin is empty!" => "Does dim byd yma. Mae eich bin sbwriel yn wag!",
+"Name" => "Enw",
 "Restore" => "Adfer",
+"Deleted" => "Wedi dileu",
 "Delete" => "Dileu",
 "Deleted Files" => "Ffeiliau Ddilewyd"
 );
diff --git a/apps/files_trashbin/l10n/da.php b/apps/files_trashbin/l10n/da.php
index 2fbc08938789690676e04c6c8e4e196d586bdb2d..c396706d1525badae3efcd674dd2eb7f50d7b5bf 100644
--- a/apps/files_trashbin/l10n/da.php
+++ b/apps/files_trashbin/l10n/da.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Kunne ikke slette %s permanent",
 "Couldn't restore %s" => "Kunne ikke gendanne %s",
-"perform restore operation" => "udfør gendannelsesoperation",
 "Error" => "Fejl",
-"delete file permanently" => "slet fil permanent",
-"Delete permanently" => "Slet permanent",
-"Name" => "Navn",
-"Deleted" => "Slettet",
-"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
-"_%n file_::_%n files_" => array("%n fil","%n filer"),
 "restored" => "Gendannet",
 "Nothing in here. Your trash bin is empty!" => "Intet at se her. Din papirkurv er tom!",
+"Name" => "Navn",
 "Restore" => "Gendan",
+"Deleted" => "Slettet",
 "Delete" => "Slet",
 "Deleted Files" => "Slettede filer"
 );
diff --git a/apps/files_trashbin/l10n/de.php b/apps/files_trashbin/l10n/de.php
index ad6e0839bd61481f401842dbeacb0ef3158faf84..2b6703dd058180421c3ff09a5be13713a4ded32e 100644
--- a/apps/files_trashbin/l10n/de.php
+++ b/apps/files_trashbin/l10n/de.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen",
 "Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
-"perform restore operation" => "Wiederherstellung ausführen",
 "Error" => "Fehler",
-"delete file permanently" => "Datei dauerhaft löschen",
-"Delete permanently" => "Endgültig löschen",
-"Name" => "Name",
-"Deleted" => "gelöscht",
-"_%n folder_::_%n folders_" => array("","%n Ordner"),
-"_%n file_::_%n files_" => array("","%n Dateien"),
 "restored" => "Wiederhergestellt",
 "Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, der Papierkorb ist leer!",
+"Name" => "Name",
 "Restore" => "Wiederherstellen",
+"Deleted" => "gelöscht",
 "Delete" => "Löschen",
 "Deleted Files" => "Gelöschte Dateien"
 );
diff --git a/apps/files_trashbin/l10n/de_CH.php b/apps/files_trashbin/l10n/de_CH.php
index 92290a0de50f438389d010a038c8e65392bb1ede..ec9f0b5309d4392f866773370408c1ff52209b4c 100644
--- a/apps/files_trashbin/l10n/de_CH.php
+++ b/apps/files_trashbin/l10n/de_CH.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen",
 "Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
-"perform restore operation" => "Wiederherstellung ausführen",
 "Error" => "Fehler",
-"delete file permanently" => "Datei dauerhaft löschen",
-"Delete permanently" => "Endgültig löschen",
-"Name" => "Name",
-"Deleted" => "Gelöscht",
-"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
-"_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
 "restored" => "Wiederhergestellt",
 "Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, Ihr Papierkorb ist leer!",
+"Name" => "Name",
 "Restore" => "Wiederherstellen",
+"Deleted" => "Gelöscht",
 "Delete" => "Löschen",
 "Deleted Files" => "Gelöschte Dateien"
 );
diff --git a/apps/files_trashbin/l10n/de_DE.php b/apps/files_trashbin/l10n/de_DE.php
index 0df6941280109e1d617e421447a21aa0e5e4aa35..ec9f0b5309d4392f866773370408c1ff52209b4c 100644
--- a/apps/files_trashbin/l10n/de_DE.php
+++ b/apps/files_trashbin/l10n/de_DE.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen",
 "Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
-"perform restore operation" => "Wiederherstellung ausführen",
 "Error" => "Fehler",
-"delete file permanently" => "Datei dauerhaft löschen",
-"Delete permanently" => "Endgültig löschen",
-"Name" => "Name",
-"Deleted" => "Gelöscht",
-"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
-"_%n file_::_%n files_" => array("%n Dateien","%n Dateien"),
 "restored" => "Wiederhergestellt",
 "Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, Ihr Papierkorb ist leer!",
+"Name" => "Name",
 "Restore" => "Wiederherstellen",
+"Deleted" => "Gelöscht",
 "Delete" => "Löschen",
 "Deleted Files" => "Gelöschte Dateien"
 );
diff --git a/apps/files_trashbin/l10n/el.php b/apps/files_trashbin/l10n/el.php
index 939c7fed6143e7879254bf7f1ec9eece441fd298..ffeafb7e9d5808c16b16533f25800abdfc30b74b 100644
--- a/apps/files_trashbin/l10n/el.php
+++ b/apps/files_trashbin/l10n/el.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Αδύνατη η μόνιμη διαγραφή του %s",
 "Couldn't restore %s" => "Αδυναμία επαναφοράς %s",
-"perform restore operation" => "εκτέλεση λειτουργία επαναφοράς",
 "Error" => "Σφάλμα",
-"delete file permanently" => "μόνιμη διαγραφή αρχείου",
-"Delete permanently" => "Μόνιμη διαγραφή",
-"Name" => "Όνομα",
-"Deleted" => "Διαγράφηκε",
-"_%n folder_::_%n folders_" => array("","%n φάκελοι"),
-"_%n file_::_%n files_" => array("","%n αρχεία"),
 "restored" => "έγινε επαναφορά",
 "Nothing in here. Your trash bin is empty!" => "Δεν υπάρχει τίποτα εδώ. Ο κάδος σας είναι άδειος!",
+"Name" => "Όνομα",
 "Restore" => "Επαναφορά",
+"Deleted" => "Διαγράφηκε",
 "Delete" => "Διαγραφή",
 "Deleted Files" => "Διαγραμμένα Αρχεία"
 );
diff --git a/apps/files_trashbin/l10n/en_GB.php b/apps/files_trashbin/l10n/en_GB.php
index be9d8b9f520dca6890f1bcf6f4d2cb94282e8113..6b179c86532bdf631c62e62e02e98d35d422051d 100644
--- a/apps/files_trashbin/l10n/en_GB.php
+++ b/apps/files_trashbin/l10n/en_GB.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Couldn't delete %s permanently",
 "Couldn't restore %s" => "Couldn't restore %s",
-"perform restore operation" => "perform restore operation",
 "Error" => "Error",
-"delete file permanently" => "delete file permanently",
-"Delete permanently" => "Delete permanently",
-"Name" => "Name",
-"Deleted" => "Deleted",
-"_%n folder_::_%n folders_" => array("%n folder","%n folders"),
-"_%n file_::_%n files_" => array("%n file","%n files"),
 "restored" => "restored",
 "Nothing in here. Your trash bin is empty!" => "Nothing in here. Your recycle bin is empty!",
+"Name" => "Name",
 "Restore" => "Restore",
+"Deleted" => "Deleted",
 "Delete" => "Delete",
 "Deleted Files" => "Deleted Files"
 );
diff --git a/apps/files_trashbin/l10n/eo.php b/apps/files_trashbin/l10n/eo.php
index d1e30cba58883a032b8e099d308a9cf8cafaf0e4..3f4023c640a5ab13000d7ec813f1f3921d51ded2 100644
--- a/apps/files_trashbin/l10n/eo.php
+++ b/apps/files_trashbin/l10n/eo.php
@@ -1,10 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Error" => "Eraro",
-"Delete permanently" => "Forigi por ĉiam",
 "Name" => "Nomo",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Restore" => "Restaŭri",
 "Delete" => "Forigi",
 "Deleted Files" => "Forigitaj dosieroj"
diff --git a/apps/files_trashbin/l10n/es.php b/apps/files_trashbin/l10n/es.php
index a5639c2c71454d6d1e5aa4210b4b94acec21b7c6..db7a617729b3393dc4439895d21abe0b9689aa94 100644
--- a/apps/files_trashbin/l10n/es.php
+++ b/apps/files_trashbin/l10n/es.php
@@ -2,17 +2,12 @@
 $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",
 "Error" => "Error",
-"delete file permanently" => "eliminar archivo permanentemente",
-"Delete permanently" => "Eliminar permanentemente",
-"Name" => "Nombre",
-"Deleted" => "Eliminado",
-"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"),
-"_%n file_::_%n files_" => array("%n archivo","%n archivos"),
 "restored" => "recuperado",
 "Nothing in here. Your trash bin is empty!" => "No hay nada aquí. ¡Tu papelera esta vacía!",
+"Name" => "Nombre",
 "Restore" => "Recuperar",
+"Deleted" => "Eliminado",
 "Delete" => "Eliminar",
 "Deleted Files" => "Archivos Eliminados"
 );
diff --git a/apps/files_trashbin/l10n/es_AR.php b/apps/files_trashbin/l10n/es_AR.php
index 0cb969a3483b4f1ce7c83aabfe6f6867510bacdd..842101d33be6deecb2f56d1a397f77ecde87910b 100644
--- a/apps/files_trashbin/l10n/es_AR.php
+++ b/apps/files_trashbin/l10n/es_AR.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "No fue posible borrar %s de manera permanente",
 "Couldn't restore %s" => "No se pudo restaurar %s",
-"perform restore operation" => "Restaurar",
 "Error" => "Error",
-"delete file permanently" => "Borrar archivo de manera permanente",
-"Delete permanently" => "Borrar de manera permanente",
-"Name" => "Nombre",
-"Deleted" => "Borrado",
-"_%n folder_::_%n folders_" => array("%n directorio","%n directorios"),
-"_%n file_::_%n files_" => array("%n archivo","%n archivos"),
 "restored" => "recuperado",
 "Nothing in here. Your trash bin is empty!" => "No hay nada acá. ¡La papelera está vacía!",
+"Name" => "Nombre",
 "Restore" => "Recuperar",
+"Deleted" => "Borrado",
 "Delete" => "Borrar",
 "Deleted Files" => "Archivos eliminados"
 );
diff --git a/apps/files_trashbin/l10n/et_EE.php b/apps/files_trashbin/l10n/et_EE.php
index 43c182ea7b38b63422b85fb62fcbac6f7d513734..56eebc79f0b60391f84d932d97b6bd1a7642f77b 100644
--- a/apps/files_trashbin/l10n/et_EE.php
+++ b/apps/files_trashbin/l10n/et_EE.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "%s jäädavalt kustutamine ebaõnnestus",
 "Couldn't restore %s" => "%s ei saa taastada",
-"perform restore operation" => "soorita taastamine",
 "Error" => "Viga",
-"delete file permanently" => "kustuta fail jäädavalt",
-"Delete permanently" => "Kustuta jäädavalt",
-"Name" => "Nimi",
-"Deleted" => "Kustutatud",
-"_%n folder_::_%n folders_" => array("","%n kataloogi"),
-"_%n file_::_%n files_" => array("%n fail","%n faili"),
 "restored" => "taastatud",
 "Nothing in here. Your trash bin is empty!" => "Siin pole midagi. Sinu prügikast on tühi!",
+"Name" => "Nimi",
 "Restore" => "Taasta",
+"Deleted" => "Kustutatud",
 "Delete" => "Kustuta",
 "Deleted Files" => "Kustutatud failid"
 );
diff --git a/apps/files_trashbin/l10n/eu.php b/apps/files_trashbin/l10n/eu.php
index 240582a7ea6c60d57f9e05e76849a509f4f36f26..04d92e01b36d2e1b79783c6859d6a5e47abc0687 100644
--- a/apps/files_trashbin/l10n/eu.php
+++ b/apps/files_trashbin/l10n/eu.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Ezin izan da %s betirako ezabatu",
 "Couldn't restore %s" => "Ezin izan da %s berreskuratu",
-"perform restore operation" => "berreskuratu",
 "Error" => "Errorea",
-"delete file permanently" => "ezabatu fitxategia betirako",
-"Delete permanently" => "Ezabatu betirako",
-"Name" => "Izena",
-"Deleted" => "Ezabatuta",
-"_%n folder_::_%n folders_" => array("karpeta %n","%n karpeta"),
-"_%n file_::_%n files_" => array("fitxategi %n","%n fitxategi"),
 "restored" => "Berrezarrita",
 "Nothing in here. Your trash bin is empty!" => "Ez dago ezer ez. Zure zakarrontzia hutsik dago!",
+"Name" => "Izena",
 "Restore" => "Berrezarri",
+"Deleted" => "Ezabatuta",
 "Delete" => "Ezabatu",
 "Deleted Files" => "Ezabatutako Fitxategiak"
 );
diff --git a/apps/files_trashbin/l10n/fa.php b/apps/files_trashbin/l10n/fa.php
index 654f20a5f1c7418a3cfd073db073a586099f8401..8409987b897fca49efa6226c97fa6da02bba1721 100644
--- a/apps/files_trashbin/l10n/fa.php
+++ b/apps/files_trashbin/l10n/fa.php
@@ -2,16 +2,11 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "%s را نمی توان برای همیشه حذف کرد",
 "Couldn't restore %s" => "%s را نمی توان بازگرداند",
-"perform restore operation" => "انجام عمل بازگرداندن",
 "Error" => "خطا",
-"delete file permanently" => "حذف فایل برای همیشه",
-"Delete permanently" => "حذف قطعی",
-"Name" => "نام",
-"Deleted" => "حذف شده",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "Nothing in here. Your trash bin is empty!" => "هیچ چیزی اینجا نیست. سطل زباله ی شما خالی است.",
+"Name" => "نام",
 "Restore" => "بازیابی",
+"Deleted" => "حذف شده",
 "Delete" => "حذف",
 "Deleted Files" => "فایلهای حذف شده"
 );
diff --git a/apps/files_trashbin/l10n/fi_FI.php b/apps/files_trashbin/l10n/fi_FI.php
index f03950981c08c00cbc6036b99ed3d39f16ce4539..b956c1c1e4c555f45219f38b0a7f305c269ce802 100644
--- a/apps/files_trashbin/l10n/fi_FI.php
+++ b/apps/files_trashbin/l10n/fi_FI.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Kohdetta %s ei voitu poistaa pysyvästi",
 "Couldn't restore %s" => "Kohteen %s palautus epäonnistui",
-"perform restore operation" => "suorita palautustoiminto",
 "Error" => "Virhe",
-"delete file permanently" => "poista tiedosto pysyvästi",
-"Delete permanently" => "Poista pysyvästi",
-"Name" => "Nimi",
-"Deleted" => "Poistettu",
-"_%n folder_::_%n folders_" => array("%n kansio","%n kansiota"),
-"_%n file_::_%n files_" => array("%n tiedosto","%n tiedostoa"),
 "restored" => "palautettu",
 "Nothing in here. Your trash bin is empty!" => "Tyhjää täynnä! Roskakorissa ei ole mitään.",
+"Name" => "Nimi",
 "Restore" => "Palauta",
+"Deleted" => "Poistettu",
 "Delete" => "Poista",
 "Deleted Files" => "Poistetut tiedostot"
 );
diff --git a/apps/files_trashbin/l10n/fr.php b/apps/files_trashbin/l10n/fr.php
index 39e1ac8614bc8c22e85537f8af63ed9d09e24164..593310e2c3296247b2d88f10a747503672892d51 100644
--- a/apps/files_trashbin/l10n/fr.php
+++ b/apps/files_trashbin/l10n/fr.php
@@ -2,17 +2,12 @@
 $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",
 "Error" => "Erreur",
-"delete file permanently" => "effacer définitivement le fichier",
-"Delete permanently" => "Supprimer de façon définitive",
-"Name" => "Nom",
-"Deleted" => "Effacé",
-"_%n folder_::_%n folders_" => array("%n dossier","%n dossiers"),
-"_%n file_::_%n files_" => array("%n fichier","%n fichiers"),
 "restored" => "restauré",
 "Nothing in here. Your trash bin is empty!" => "Il n'y a rien ici. Votre corbeille est vide !",
+"Name" => "Nom",
 "Restore" => "Restaurer",
+"Deleted" => "Effacé",
 "Delete" => "Supprimer",
 "Deleted Files" => "Fichiers effacés"
 );
diff --git a/apps/files_trashbin/l10n/gl.php b/apps/files_trashbin/l10n/gl.php
index 568c17607fe0eb90554711df084aae6ce981bf21..ae7ef8b319bb3113ee7599ecaa7c3a7765018ba2 100644
--- a/apps/files_trashbin/l10n/gl.php
+++ b/apps/files_trashbin/l10n/gl.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Non foi posíbel eliminar %s permanente",
 "Couldn't restore %s" => "Non foi posíbel restaurar %s",
-"perform restore operation" => "realizar a operación de restauración",
 "Error" => "Erro",
-"delete file permanently" => "eliminar o ficheiro permanentemente",
-"Delete permanently" => "Eliminar permanentemente",
-"Name" => "Nome",
-"Deleted" => "Eliminado",
-"_%n folder_::_%n folders_" => array("%n cartafol","%n cartafoles"),
-"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
 "restored" => "restaurado",
 "Nothing in here. Your trash bin is empty!" => "Aquí non hai nada. O cesto do lixo está baleiro!",
+"Name" => "Nome",
 "Restore" => "Restablecer",
+"Deleted" => "Eliminado",
 "Delete" => "Eliminar",
 "Deleted Files" => "Ficheiros eliminados"
 );
diff --git a/apps/files_trashbin/l10n/he.php b/apps/files_trashbin/l10n/he.php
index 6aa6264a315914829450a6a1cc4069de9e12d92e..d0bcb327d4a639634d7c40037b77589e5a4a9334 100644
--- a/apps/files_trashbin/l10n/he.php
+++ b/apps/files_trashbin/l10n/he.php
@@ -2,16 +2,11 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "לא ניתן למחוק את %s לצמיתות",
 "Couldn't restore %s" => "לא ניתן לשחזר את %s",
-"perform restore operation" => "ביצוע פעולת שחזור",
 "Error" => "שגיאה",
-"delete file permanently" => "מחיקת קובץ לצמיתות",
-"Delete permanently" => "מחיקה לצמיתות",
-"Name" => "שם",
-"Deleted" => "נמחק",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Nothing in here. Your trash bin is empty!" => "אין כאן שום דבר. סל המיחזור שלך ריק!",
+"Name" => "שם",
 "Restore" => "שחזור",
+"Deleted" => "נמחק",
 "Delete" => "מחיקה",
 "Deleted Files" => "קבצים שנמחקו"
 );
diff --git a/apps/files_trashbin/l10n/hi.php b/apps/files_trashbin/l10n/hi.php
index 71711218b14dad40bfa6fafa6987278cdd1b45e0..d4a26011b58cafd50b8a07eef17308d779f69eb1 100644
--- a/apps/files_trashbin/l10n/hi.php
+++ b/apps/files_trashbin/l10n/hi.php
@@ -1,7 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Error" => "त्रुटि",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("","")
+"Error" => "त्रुटि"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/hr.php b/apps/files_trashbin/l10n/hr.php
index d227b4979aadbc0e0929e603a69b682b34c88469..8e8fd22f8ef0280b60f5d8f2f76c85e72755a0ef 100644
--- a/apps/files_trashbin/l10n/hr.php
+++ b/apps/files_trashbin/l10n/hr.php
@@ -2,8 +2,6 @@
 $TRANSLATIONS = array(
 "Error" => "Greška",
 "Name" => "Ime",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
 "Delete" => "Obriši"
 );
 $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;";
diff --git a/apps/files_trashbin/l10n/hu_HU.php b/apps/files_trashbin/l10n/hu_HU.php
index 766ddcbce4de9dd91d471315cd81f663239091b1..aa8b45a7d65c8bd15f469aeeedabb4de39547433 100644
--- a/apps/files_trashbin/l10n/hu_HU.php
+++ b/apps/files_trashbin/l10n/hu_HU.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nem sikerült %s végleges törlése",
 "Couldn't restore %s" => "Nem sikerült %s visszaállítása",
-"perform restore operation" => "a visszaállítás végrehajtása",
 "Error" => "Hiba",
-"delete file permanently" => "az állomány végleges törlése",
-"Delete permanently" => "Végleges törlés",
-"Name" => "Név",
-"Deleted" => "Törölve",
-"_%n folder_::_%n folders_" => array("","%n mappa"),
-"_%n file_::_%n files_" => array("","%n állomány"),
 "restored" => "visszaállítva",
 "Nothing in here. Your trash bin is empty!" => "Itt nincs semmi. Az Ön szemetes mappája üres!",
+"Name" => "Név",
 "Restore" => "Visszaállítás",
+"Deleted" => "Törölve",
 "Delete" => "Törlés",
 "Deleted Files" => "Törölt fájlok"
 );
diff --git a/apps/files_trashbin/l10n/hy.php b/apps/files_trashbin/l10n/hy.php
index 6ff58b56202081827d5ef70cc85325aa7c0803e0..f933bec8feb91959b1303f8d028dda1c815ccf3e 100644
--- a/apps/files_trashbin/l10n/hy.php
+++ b/apps/files_trashbin/l10n/hy.php
@@ -1,7 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Delete" => "Ջնջել"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/ia.php b/apps/files_trashbin/l10n/ia.php
index c583344a81e1b624563f77b1be7ec8f0654082a2..7709ef030e365faac2c10e44a0abafbc78215736 100644
--- a/apps/files_trashbin/l10n/ia.php
+++ b/apps/files_trashbin/l10n/ia.php
@@ -2,8 +2,6 @@
 $TRANSLATIONS = array(
 "Error" => "Error",
 "Name" => "Nomine",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Delete" => "Deler"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/id.php b/apps/files_trashbin/l10n/id.php
index 6aad1302f43e4442d7c50d3d2f7acbd5877e221a..a55520fc117c8b143ed2ad1aafdfaf2ac806c119 100644
--- a/apps/files_trashbin/l10n/id.php
+++ b/apps/files_trashbin/l10n/id.php
@@ -2,16 +2,11 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Tidak dapat menghapus permanen %s",
 "Couldn't restore %s" => "Tidak dapat memulihkan %s",
-"perform restore operation" => "jalankan operasi pemulihan",
 "Error" => "Galat",
-"delete file permanently" => "hapus berkas secara permanen",
-"Delete permanently" => "Hapus secara permanen",
-"Name" => "Nama",
-"Deleted" => "Dihapus",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "Nothing in here. Your trash bin is empty!" => "Tempat sampah anda kosong!",
+"Name" => "Nama",
 "Restore" => "Pulihkan",
+"Deleted" => "Dihapus",
 "Delete" => "Hapus",
 "Deleted Files" => "Berkas yang Dihapus"
 );
diff --git a/apps/files_trashbin/l10n/is.php b/apps/files_trashbin/l10n/is.php
index 55ae433646147d0694d9324c949d3de602173718..8ccf89739fca1dc486d2c5ac98aae71e557c2d7d 100644
--- a/apps/files_trashbin/l10n/is.php
+++ b/apps/files_trashbin/l10n/is.php
@@ -2,8 +2,6 @@
 $TRANSLATIONS = array(
 "Error" => "Villa",
 "Name" => "Nafn",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Delete" => "Eyða"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/it.php b/apps/files_trashbin/l10n/it.php
index e4b39c4a6d59d9becc9bbb1ff070c45caa8f1300..b631e0c9e4ffa80dd419f6219f8b786a0094ea86 100644
--- a/apps/files_trashbin/l10n/it.php
+++ b/apps/files_trashbin/l10n/it.php
@@ -2,17 +2,12 @@
 $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",
 "Error" => "Errore",
-"delete file permanently" => "elimina il file definitivamente",
-"Delete permanently" => "Elimina definitivamente",
-"Name" => "Nome",
-"Deleted" => "Eliminati",
-"_%n folder_::_%n folders_" => array("%n cartella","%n cartelle"),
-"_%n file_::_%n files_" => array("%n file","%n file"),
 "restored" => "ripristinati",
 "Nothing in here. Your trash bin is empty!" => "Qui non c'è niente. Il tuo cestino è vuoto.",
+"Name" => "Nome",
 "Restore" => "Ripristina",
+"Deleted" => "Eliminati",
 "Delete" => "Elimina",
 "Deleted Files" => "File eliminati"
 );
diff --git a/apps/files_trashbin/l10n/ja_JP.php b/apps/files_trashbin/l10n/ja_JP.php
index eb9748d57c04af064215003511089c12b805b199..e819a92559be20205a58338b69f845fba8cf8f73 100644
--- a/apps/files_trashbin/l10n/ja_JP.php
+++ b/apps/files_trashbin/l10n/ja_JP.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "%s を完全に削除出来ませんでした",
 "Couldn't restore %s" => "%s を復元出来ませんでした",
-"perform restore operation" => "復元操作を実行する",
 "Error" => "エラー",
-"delete file permanently" => "ファイルを完全に削除する",
-"Delete permanently" => "完全に削除する",
-"Name" => "名前",
-"Deleted" => "削除済み",
-"_%n folder_::_%n folders_" => array("%n個のフォルダ"),
-"_%n file_::_%n files_" => array("%n個のファイル"),
 "restored" => "復元済",
 "Nothing in here. Your trash bin is empty!" => "ここには何もありません。ゴミ箱は空です!",
+"Name" => "名前",
 "Restore" => "復元",
+"Deleted" => "削除済み",
 "Delete" => "削除",
 "Deleted Files" => "削除されたファイル"
 );
diff --git a/apps/files_trashbin/l10n/ka_GE.php b/apps/files_trashbin/l10n/ka_GE.php
index 236d8951e9dcf47368d21fab951bbd7b5e0a7967..7440171deef94b7eebdafb0bfab8258251c35cbf 100644
--- a/apps/files_trashbin/l10n/ka_GE.php
+++ b/apps/files_trashbin/l10n/ka_GE.php
@@ -2,16 +2,11 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "ფაილი %s–ის სრულად წაშლა ვერ მოხერხდა",
 "Couldn't restore %s" => "%s–ის აღდგენა ვერ მოხერხდა",
-"perform restore operation" => "მიმდინარეობს აღდგენის ოპერაცია",
 "Error" => "შეცდომა",
-"delete file permanently" => "ფაილის სრულად წაშლა",
-"Delete permanently" => "სრულად წაშლა",
-"Name" => "სახელი",
-"Deleted" => "წაშლილი",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "Nothing in here. Your trash bin is empty!" => "აქ არაფერი არ არის. სანაგვე ყუთი ცარიელია!",
+"Name" => "სახელი",
 "Restore" => "აღდგენა",
+"Deleted" => "წაშლილი",
 "Delete" => "წაშლა",
 "Deleted Files" => "წაშლილი ფაილები"
 );
diff --git a/apps/files_trashbin/l10n/ko.php b/apps/files_trashbin/l10n/ko.php
index 9ac5f9802c683671fe3d156e9fb39655fddbcda9..809ecfea15dff03ca8c0039521d462fcb0a20d5d 100644
--- a/apps/files_trashbin/l10n/ko.php
+++ b/apps/files_trashbin/l10n/ko.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "%s를 영구적으로 삭제할수 없습니다",
 "Couldn't restore %s" => "%s를 복원할수 없습니다",
-"perform restore operation" => "복원 작업중",
 "Error" => "오류",
-"delete file permanently" => "영구적으로 파일 삭제하기",
-"Delete permanently" => "영원히 삭제",
-"Name" => "이름",
-"Deleted" => "삭제됨",
-"_%n folder_::_%n folders_" => array("폴더 %n개"),
-"_%n file_::_%n files_" => array("파일 %n개 "),
 "restored" => "복원됨",
 "Nothing in here. Your trash bin is empty!" => "현재 휴지통은 비어있습니다!",
+"Name" => "이름",
 "Restore" => "복원",
+"Deleted" => "삭제됨",
 "Delete" => "삭제",
 "Deleted Files" => "삭제된 파일들"
 );
diff --git a/apps/files_trashbin/l10n/ku_IQ.php b/apps/files_trashbin/l10n/ku_IQ.php
index 3f110f06002b4386638af1efde66098d4cd25096..c1962a4075d4c203cca3bd8424ab2cb951c3040a 100644
--- a/apps/files_trashbin/l10n/ku_IQ.php
+++ b/apps/files_trashbin/l10n/ku_IQ.php
@@ -1,8 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Error" => "هه‌ڵه",
-"Name" => "ناو",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("","")
+"Name" => "ناو"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/lb.php b/apps/files_trashbin/l10n/lb.php
index cbfd515a8b3fd2c335ae318a7eca8af7fe3b554f..b434ae72176e44391d4a0a256d3c3e46a40ccea9 100644
--- a/apps/files_trashbin/l10n/lb.php
+++ b/apps/files_trashbin/l10n/lb.php
@@ -2,8 +2,6 @@
 $TRANSLATIONS = array(
 "Error" => "Fehler",
 "Name" => "Numm",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Delete" => "Läschen"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/lt_LT.php b/apps/files_trashbin/l10n/lt_LT.php
index 0a51290f4d99bf12f2ffea6417eb951179df7efc..c4a8463fd0e9df0a0177ba8ab33fac2282ba43bf 100644
--- a/apps/files_trashbin/l10n/lt_LT.php
+++ b/apps/files_trashbin/l10n/lt_LT.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nepavyko negrįžtamai ištrinti %s",
 "Couldn't restore %s" => "Nepavyko atkurti %s",
-"perform restore operation" => "atkurti",
 "Error" => "Klaida",
-"delete file permanently" => "failą ištrinti negrįžtamai",
-"Delete permanently" => "Ištrinti negrįžtamai",
-"Name" => "Pavadinimas",
-"Deleted" => "Ištrinti",
-"_%n folder_::_%n folders_" => array("","","%n aplankų"),
-"_%n file_::_%n files_" => array("","","%n failų"),
 "restored" => "atstatyta",
 "Nothing in here. Your trash bin is empty!" => "Nieko nėra. Jūsų šiukšliadėžė tuščia!",
+"Name" => "Pavadinimas",
 "Restore" => "Atstatyti",
+"Deleted" => "Ištrinti",
 "Delete" => "Ištrinti",
 "Deleted Files" => "Ištrinti failai"
 );
diff --git a/apps/files_trashbin/l10n/lv.php b/apps/files_trashbin/l10n/lv.php
index ca833b2420883c15dd69073f6c932344551edb71..5c04a0c97d15948553276bc99a989c620b90e500 100644
--- a/apps/files_trashbin/l10n/lv.php
+++ b/apps/files_trashbin/l10n/lv.php
@@ -2,17 +2,12 @@
 $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",
 "Error" => "Kļūda",
-"delete file permanently" => "dzēst datni pavisam",
-"Delete permanently" => "Dzēst pavisam",
-"Name" => "Nosaukums",
-"Deleted" => "Dzēsts",
-"_%n folder_::_%n folders_" => array("Nekas, %n mapes","%n mape","%n mapes"),
-"_%n file_::_%n files_" => array("Neviens! %n faaili","%n fails","%n faili"),
 "restored" => "atjaunots",
 "Nothing in here. Your trash bin is empty!" => "Šeit nekā nav. Jūsu miskaste ir tukša!",
+"Name" => "Nosaukums",
 "Restore" => "Atjaunot",
+"Deleted" => "Dzēsts",
 "Delete" => "Dzēst",
 "Deleted Files" => "Dzēstās datnes"
 );
diff --git a/apps/files_trashbin/l10n/mk.php b/apps/files_trashbin/l10n/mk.php
index 965518dbc86e043c42cb8c7ac0246a9eb9365f54..9200be01cd1feda7594a2ed5d3f5ae9d53aa2e68 100644
--- a/apps/files_trashbin/l10n/mk.php
+++ b/apps/files_trashbin/l10n/mk.php
@@ -2,8 +2,6 @@
 $TRANSLATIONS = array(
 "Error" => "Грешка",
 "Name" => "Име",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Delete" => "Избриши"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files_trashbin/l10n/ms_MY.php b/apps/files_trashbin/l10n/ms_MY.php
index 1b5ca07c70cff20792d903193d4cf04b1fa6b19f..1972eba0318204538d580f4f51c9caa2cf6978f5 100644
--- a/apps/files_trashbin/l10n/ms_MY.php
+++ b/apps/files_trashbin/l10n/ms_MY.php
@@ -2,8 +2,6 @@
 $TRANSLATIONS = array(
 "Error" => "Ralat",
 "Name" => "Nama",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "Delete" => "Padam"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/nb_NO.php b/apps/files_trashbin/l10n/nb_NO.php
index 8eb3bc1846fbd746fad12313e32ddd32beeba87c..eb917e3dde6af699b68713ab3b74b879bd0ac505 100644
--- a/apps/files_trashbin/l10n/nb_NO.php
+++ b/apps/files_trashbin/l10n/nb_NO.php
@@ -2,16 +2,11 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Kunne ikke slette %s fullstendig",
 "Couldn't restore %s" => "Kunne ikke gjenopprette %s",
-"perform restore operation" => "utfør gjenopprettings operasjon",
 "Error" => "Feil",
-"delete file permanently" => "slett filer permanent",
-"Delete permanently" => "Slett permanent",
-"Name" => "Navn",
-"Deleted" => "Slettet",
-"_%n folder_::_%n folders_" => array("","%n mapper"),
-"_%n file_::_%n files_" => array("","%n filer"),
 "Nothing in here. Your trash bin is empty!" => "Ingenting her. Søppelkassen din er tom!",
+"Name" => "Navn",
 "Restore" => "Gjenopprett",
+"Deleted" => "Slettet",
 "Delete" => "Slett",
 "Deleted Files" => "Slettet filer"
 );
diff --git a/apps/files_trashbin/l10n/nl.php b/apps/files_trashbin/l10n/nl.php
index b3ae57da56337ddb8bfdf35f140539533b7b6a7e..37a8ca654097a7b9164f62a683e4f93f55282a81 100644
--- a/apps/files_trashbin/l10n/nl.php
+++ b/apps/files_trashbin/l10n/nl.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Kon %s niet permanent verwijderen",
 "Couldn't restore %s" => "Kon %s niet herstellen",
-"perform restore operation" => "uitvoeren restore operatie",
 "Error" => "Fout",
-"delete file permanently" => "verwijder bestanden definitief",
-"Delete permanently" => "Verwijder definitief",
-"Name" => "Naam",
-"Deleted" => "Verwijderd",
-"_%n folder_::_%n folders_" => array("%n map","%n mappen"),
-"_%n file_::_%n files_" => array("%n bestand","%n bestanden"),
 "restored" => "hersteld",
 "Nothing in here. Your trash bin is empty!" => "Niets te vinden. Uw prullenbak is leeg!",
+"Name" => "Naam",
 "Restore" => "Herstellen",
+"Deleted" => "Verwijderd",
 "Delete" => "Verwijder",
 "Deleted Files" => "Verwijderde bestanden"
 );
diff --git a/apps/files_trashbin/l10n/nn_NO.php b/apps/files_trashbin/l10n/nn_NO.php
index 73fe48211c293719e167c1c4c0f7722cfd0cc735..39e2d5cda91a2535cb0464a199b684b142e2411f 100644
--- a/apps/files_trashbin/l10n/nn_NO.php
+++ b/apps/files_trashbin/l10n/nn_NO.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Klarte ikkje sletta %s for godt",
 "Couldn't restore %s" => "Klarte ikkje gjenoppretta %s",
-"perform restore operation" => "utfør gjenoppretting",
 "Error" => "Feil",
-"delete file permanently" => "slett fila for godt",
-"Delete permanently" => "Slett for godt",
-"Name" => "Namn",
-"Deleted" => "Sletta",
-"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
-"_%n file_::_%n files_" => array("%n fil","%n filer"),
 "restored" => "gjenoppretta",
 "Nothing in here. Your trash bin is empty!" => "Ingenting her. Papirkorga di er tom!",
+"Name" => "Namn",
 "Restore" => "Gjenopprett",
+"Deleted" => "Sletta",
 "Delete" => "Slett",
 "Deleted Files" => "Sletta filer"
 );
diff --git a/apps/files_trashbin/l10n/oc.php b/apps/files_trashbin/l10n/oc.php
index a62902c3b7e89ca6bc1d54f4a4c3d798d7bfc997..b472683f08d43f63e59e2fd5102af364bee5bf65 100644
--- a/apps/files_trashbin/l10n/oc.php
+++ b/apps/files_trashbin/l10n/oc.php
@@ -2,8 +2,6 @@
 $TRANSLATIONS = array(
 "Error" => "Error",
 "Name" => "Nom",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Delete" => "Escafa"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_trashbin/l10n/pa.php b/apps/files_trashbin/l10n/pa.php
index e53707fd7077c2fdcada3484af32c770f87b841f..825a49aaea4305e771208f3e96a7bb46d2fbc403 100644
--- a/apps/files_trashbin/l10n/pa.php
+++ b/apps/files_trashbin/l10n/pa.php
@@ -1,8 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Error" => "ਗਲਤੀ",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Delete" => "ਹਟਾਓ"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/pl.php b/apps/files_trashbin/l10n/pl.php
index c838a6b956c2e583964dcc186fc9d7ebaac6509b..961b77278241eebd23f0ac2042542a9ffe31e79c 100644
--- a/apps/files_trashbin/l10n/pl.php
+++ b/apps/files_trashbin/l10n/pl.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nie można trwale usunąć %s",
 "Couldn't restore %s" => "Nie można przywrócić %s",
-"perform restore operation" => "wykonywanie operacji przywracania",
 "Error" => "Błąd",
-"delete file permanently" => "trwale usuń plik",
-"Delete permanently" => "Trwale usuń",
-"Name" => "Nazwa",
-"Deleted" => "Usunięte",
-"_%n folder_::_%n folders_" => array("","","%n katalogów"),
-"_%n file_::_%n files_" => array("","","%n plików"),
 "restored" => "przywrócony",
 "Nothing in here. Your trash bin is empty!" => "Nic tu nie ma. Twój kosz jest pusty!",
+"Name" => "Nazwa",
 "Restore" => "Przywróć",
+"Deleted" => "Usunięte",
 "Delete" => "Usuń",
 "Deleted Files" => "Usunięte pliki"
 );
diff --git a/apps/files_trashbin/l10n/pt_BR.php b/apps/files_trashbin/l10n/pt_BR.php
index e0e8c8faec6b7f87f0e62a6e3557474514fac548..c2100efe96e2d955cc9888b8f006d78f3bb12a4a 100644
--- a/apps/files_trashbin/l10n/pt_BR.php
+++ b/apps/files_trashbin/l10n/pt_BR.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Não foi possível excluir %s permanentemente",
 "Couldn't restore %s" => "Não foi possível restaurar %s",
-"perform restore operation" => "realizar operação de restauração",
 "Error" => "Erro",
-"delete file permanently" => "excluir arquivo permanentemente",
-"Delete permanently" => "Excluir permanentemente",
-"Name" => "Nome",
-"Deleted" => "Excluído",
-"_%n folder_::_%n folders_" => array("","%n pastas"),
-"_%n file_::_%n files_" => array("%n arquivo","%n arquivos"),
 "restored" => "restaurado",
 "Nothing in here. Your trash bin is empty!" => "Nada aqui. Sua lixeira está vazia!",
+"Name" => "Nome",
 "Restore" => "Restaurar",
+"Deleted" => "Excluído",
 "Delete" => "Excluir",
 "Deleted Files" => "Arquivos Apagados"
 );
diff --git a/apps/files_trashbin/l10n/pt_PT.php b/apps/files_trashbin/l10n/pt_PT.php
index 9dccc773cb1adfcb222cb46cab541f9dc7d3e9b4..89e84a84d283b9c441d6d0862e3e6309c318c8f1 100644
--- a/apps/files_trashbin/l10n/pt_PT.php
+++ b/apps/files_trashbin/l10n/pt_PT.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Não foi possível eliminar %s de forma permanente",
 "Couldn't restore %s" => "Não foi possível restaurar %s",
-"perform restore operation" => "executar a operação de restauro",
 "Error" => "Erro",
-"delete file permanently" => "Eliminar permanentemente o(s) ficheiro(s)",
-"Delete permanently" => "Eliminar permanentemente",
-"Name" => "Nome",
-"Deleted" => "Apagado",
-"_%n folder_::_%n folders_" => array("%n pasta","%n pastas"),
-"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
 "restored" => "Restaurado",
 "Nothing in here. Your trash bin is empty!" => "Não hà ficheiros. O lixo está vazio!",
+"Name" => "Nome",
 "Restore" => "Restaurar",
+"Deleted" => "Apagado",
 "Delete" => "Eliminar",
 "Deleted Files" => "Ficheiros Apagados"
 );
diff --git a/apps/files_trashbin/l10n/ro.php b/apps/files_trashbin/l10n/ro.php
index 12377bb065249cf371c38a6e7730baf988541877..f285dcc164ed0a990155a1ba01f7f11ed2bbd5f3 100644
--- a/apps/files_trashbin/l10n/ro.php
+++ b/apps/files_trashbin/l10n/ro.php
@@ -1,10 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Error" => "Eroare",
-"Delete permanently" => "Stergere permanenta",
 "Name" => "Nume",
-"_%n folder_::_%n folders_" => array("","","%n directoare"),
-"_%n file_::_%n files_" => array("","","%n fișiere"),
 "Delete" => "Șterge"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_trashbin/l10n/ru.php b/apps/files_trashbin/l10n/ru.php
index 5f52263a1185a613625b20d4b6e8a2c90386ce2c..06a4f864c6753f5c7216cde64061c0dd01f45703 100644
--- a/apps/files_trashbin/l10n/ru.php
+++ b/apps/files_trashbin/l10n/ru.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "%s не может быть удалён навсегда",
 "Couldn't restore %s" => "%s не может быть восстановлен",
-"perform restore operation" => "выполнить операцию восстановления",
 "Error" => "Ошибка",
-"delete file permanently" => "удалить файл навсегда",
-"Delete permanently" => "Удалено навсегда",
-"Name" => "Имя",
-"Deleted" => "Удалён",
-"_%n folder_::_%n folders_" => array("","","%n папок"),
-"_%n file_::_%n files_" => array("","","%n файлов"),
 "restored" => "восстановлен",
 "Nothing in here. Your trash bin is empty!" => "Здесь ничего нет. Ваша корзина пуста!",
+"Name" => "Имя",
 "Restore" => "Восстановить",
+"Deleted" => "Удалён",
 "Delete" => "Удалить",
 "Deleted Files" => "Удаленные файлы"
 );
diff --git a/apps/files_trashbin/l10n/si_LK.php b/apps/files_trashbin/l10n/si_LK.php
index 6dad84437cf37981ac08e7593a85c60e3a1d7739..87e928989e40e077720a9364452824d6f63dd293 100644
--- a/apps/files_trashbin/l10n/si_LK.php
+++ b/apps/files_trashbin/l10n/si_LK.php
@@ -2,8 +2,6 @@
 $TRANSLATIONS = array(
 "Error" => "දෝෂයක්",
 "Name" => "නම",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Delete" => "මකා දමන්න"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/sk_SK.php b/apps/files_trashbin/l10n/sk_SK.php
index 50fb58a44e267275c800dba706b35d3a3b7e3626..b23383c1214f928e185e998f6997478358b56093 100644
--- a/apps/files_trashbin/l10n/sk_SK.php
+++ b/apps/files_trashbin/l10n/sk_SK.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nemožno zmazať %s navždy",
 "Couldn't restore %s" => "Nemožno obnoviť %s",
-"perform restore operation" => "vykonať obnovu",
 "Error" => "Chyba",
-"delete file permanently" => "trvalo zmazať súbor",
-"Delete permanently" => "Zmazať  trvalo",
-"Name" => "Názov",
-"Deleted" => "Zmazané",
-"_%n folder_::_%n folders_" => array("%n priečinok","%n priečinky","%n priečinkov"),
-"_%n file_::_%n files_" => array("%n súbor","%n súbory","%n súborov"),
 "restored" => "obnovené",
 "Nothing in here. Your trash bin is empty!" => "Žiadny obsah. Kôš je prázdny!",
+"Name" => "Názov",
 "Restore" => "Obnoviť",
+"Deleted" => "Zmazané",
 "Delete" => "Zmazať",
 "Deleted Files" => "Zmazané súbory"
 );
diff --git a/apps/files_trashbin/l10n/sl.php b/apps/files_trashbin/l10n/sl.php
index eb2d42a18ff4d489d722c06fb06f630c10e505ab..a3c0bcf92ad675ea2e646a34cdb4c13d8f5b404b 100644
--- a/apps/files_trashbin/l10n/sl.php
+++ b/apps/files_trashbin/l10n/sl.php
@@ -2,16 +2,11 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Datoteke %s ni mogoče dokončno izbrisati.",
 "Couldn't restore %s" => "Ni mogoče obnoviti %s",
-"perform restore operation" => "izvedi opravilo obnavljanja",
 "Error" => "Napaka",
-"delete file permanently" => "dokončno izbriši datoteko",
-"Delete permanently" => "Izbriši dokončno",
-"Name" => "Ime",
-"Deleted" => "Izbrisano",
-"_%n folder_::_%n folders_" => array("","","",""),
-"_%n file_::_%n files_" => array("","","",""),
 "Nothing in here. Your trash bin is empty!" => "Mapa smeti je prazna.",
+"Name" => "Ime",
 "Restore" => "Obnovi",
+"Deleted" => "Izbrisano",
 "Delete" => "Izbriši",
 "Deleted Files" => "Izbrisane datoteke"
 );
diff --git a/apps/files_trashbin/l10n/sq.php b/apps/files_trashbin/l10n/sq.php
index 50ca7d901b598f10dd6502c22e4e24f955d01f97..63957080f375a669f617c1266f6265eba79e14fb 100644
--- a/apps/files_trashbin/l10n/sq.php
+++ b/apps/files_trashbin/l10n/sq.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nuk munda ta eliminoj përfundimisht %s",
 "Couldn't restore %s" => "Nuk munda ta rivendos %s",
-"perform restore operation" => "ekzekuto operacionin e rivendosjes",
 "Error" => "Veprim i gabuar",
-"delete file permanently" => "eliminoje përfundimisht skedarin",
-"Delete permanently" => "Elimino përfundimisht",
-"Name" => "Emri",
-"Deleted" => "Eliminuar",
-"_%n folder_::_%n folders_" => array("%n dosje","%n dosje"),
-"_%n file_::_%n files_" => array("%n skedar","%n skedarë"),
 "restored" => "rivendosur",
 "Nothing in here. Your trash bin is empty!" => "Këtu nuk ka asgjë. Koshi juaj është bosh!",
+"Name" => "Emri",
 "Restore" => "Rivendos",
+"Deleted" => "Eliminuar",
 "Delete" => "Elimino",
 "Deleted Files" => "Skedarë të eliminuar"
 );
diff --git a/apps/files_trashbin/l10n/sr.php b/apps/files_trashbin/l10n/sr.php
index 7311e759f989ca7747c0a47533d6011c4a2efa82..c893dba118b825efe88acff8e36da639c78eaf3f 100644
--- a/apps/files_trashbin/l10n/sr.php
+++ b/apps/files_trashbin/l10n/sr.php
@@ -1,14 +1,10 @@
 <?php
 $TRANSLATIONS = array(
-"perform restore operation" => "врати у претходно стање",
 "Error" => "Грешка",
-"Delete permanently" => "Обриши за стално",
-"Name" => "Име",
-"Deleted" => "Обрисано",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
 "Nothing in here. Your trash bin is empty!" => "Овде нема ништа. Корпа за отпатке је празна.",
+"Name" => "Име",
 "Restore" => "Врати",
+"Deleted" => "Обрисано",
 "Delete" => "Обриши"
 );
 $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);";
diff --git a/apps/files_trashbin/l10n/sr@latin.php b/apps/files_trashbin/l10n/sr@latin.php
index fa30afcf4bf53d8ca8e5c79382df29212513d315..9f18ac8be7d547f0440c72a28eb15ffcf33840e9 100644
--- a/apps/files_trashbin/l10n/sr@latin.php
+++ b/apps/files_trashbin/l10n/sr@latin.php
@@ -2,8 +2,6 @@
 $TRANSLATIONS = array(
 "Error" => "Greška",
 "Name" => "Ime",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
 "Delete" => "Obriši"
 );
 $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);";
diff --git a/apps/files_trashbin/l10n/sv.php b/apps/files_trashbin/l10n/sv.php
index 47a52f25736459b9078bad87064b56b85d6f9771..21d4d15e9ccbf23dd9a4e751eafec90bd43b1d9d 100644
--- a/apps/files_trashbin/l10n/sv.php
+++ b/apps/files_trashbin/l10n/sv.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Kunde inte radera %s permanent",
 "Couldn't restore %s" => "Kunde inte återställa %s",
-"perform restore operation" => "utför återställning",
 "Error" => "Fel",
-"delete file permanently" => "radera filen permanent",
-"Delete permanently" => "Radera permanent",
-"Name" => "Namn",
-"Deleted" => "Raderad",
-"_%n folder_::_%n folders_" => array("%n mapp","%n mappar"),
-"_%n file_::_%n files_" => array("%n fil","%n filer"),
 "restored" => "återställd",
 "Nothing in here. Your trash bin is empty!" => "Ingenting här. Din papperskorg är tom!",
+"Name" => "Namn",
 "Restore" => "Återskapa",
+"Deleted" => "Raderad",
 "Delete" => "Radera",
 "Deleted Files" => "Raderade filer"
 );
diff --git a/apps/files_trashbin/l10n/ta_LK.php b/apps/files_trashbin/l10n/ta_LK.php
index ed93b459c7db36046316ae7af68f8c9cdd60a7fc..79349919b52eff9277d776bade1f97fc3ca38280 100644
--- a/apps/files_trashbin/l10n/ta_LK.php
+++ b/apps/files_trashbin/l10n/ta_LK.php
@@ -2,8 +2,6 @@
 $TRANSLATIONS = array(
 "Error" => "வழு",
 "Name" => "பெயர்",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Delete" => "நீக்குக"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/te.php b/apps/files_trashbin/l10n/te.php
index 0d803a8e648535a642a395e14e6ea56dee5edc6f..01262b78232920852f3d72ec69257f9d2274155f 100644
--- a/apps/files_trashbin/l10n/te.php
+++ b/apps/files_trashbin/l10n/te.php
@@ -1,10 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Error" => "పొరపాటు",
-"Delete permanently" => "శాశ్వతంగా తొలగించు",
 "Name" => "పేరు",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Delete" => "తొలగించు"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/th_TH.php b/apps/files_trashbin/l10n/th_TH.php
index 31caa11aac303bc0226b360145f37404b31858e7..65fd081a952e2226dc8d72966acd1f47cb1b8a11 100644
--- a/apps/files_trashbin/l10n/th_TH.php
+++ b/apps/files_trashbin/l10n/th_TH.php
@@ -1,13 +1,10 @@
 <?php
 $TRANSLATIONS = array(
-"perform restore operation" => "ดำเนินการคืนค่า",
 "Error" => "ข้อผิดพลาด",
-"Name" => "ชื่อ",
-"Deleted" => "ลบแล้ว",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "Nothing in here. Your trash bin is empty!" => "ไม่มีอะไรอยู่ในนี้ ถังขยะของคุณยังว่างอยู่",
+"Name" => "ชื่อ",
 "Restore" => "คืนค่า",
+"Deleted" => "ลบแล้ว",
 "Delete" => "ลบ",
 "Deleted Files" => "ไฟล์ที่ลบทิ้ง"
 );
diff --git a/apps/files_trashbin/l10n/tr.php b/apps/files_trashbin/l10n/tr.php
index f25b179bc1efbcbc47cb3da9e86f6c77663e64c2..873dc631fe8a7d0561518fb5f28e08697ca02052 100644
--- a/apps/files_trashbin/l10n/tr.php
+++ b/apps/files_trashbin/l10n/tr.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "%s Kalıcı olarak silinemedi",
 "Couldn't restore %s" => "%s Geri yüklenemedi",
-"perform restore operation" => "Geri yükleme işlemini gerçekleştir",
 "Error" => "Hata",
-"delete file permanently" => "Dosyayı kalıcı olarak sil",
-"Delete permanently" => "Kalıcı olarak sil",
-"Name" => "İsim",
-"Deleted" => "Silindi",
-"_%n folder_::_%n folders_" => array("","%n dizin"),
-"_%n file_::_%n files_" => array("","%n dosya"),
 "restored" => "geri yüklendi",
 "Nothing in here. Your trash bin is empty!" => "Burası boş. Çöp kutun tamamen boş.",
+"Name" => "İsim",
 "Restore" => "Geri yükle",
+"Deleted" => "Silindi",
 "Delete" => "Sil",
 "Deleted Files" => "Silinen Dosyalar"
 );
diff --git a/apps/files_trashbin/l10n/ug.php b/apps/files_trashbin/l10n/ug.php
index ad983aee18b7cc425e530b0e0466355a18b9adfb..54c040c88a7dd935b57e52f5ec4042240bb78374 100644
--- a/apps/files_trashbin/l10n/ug.php
+++ b/apps/files_trashbin/l10n/ug.php
@@ -1,12 +1,9 @@
 <?php
 $TRANSLATIONS = array(
 "Error" => "خاتالىق",
-"Delete permanently" => "مەڭگۈلۈك ئۆچۈر",
+"Nothing in here. Your trash bin is empty!" => "بۇ جايدا ھېچنېمە يوق. Your trash bin is empty!",
 "Name" => "ئاتى",
 "Deleted" => "ئۆچۈرۈلدى",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
-"Nothing in here. Your trash bin is empty!" => "بۇ جايدا ھېچنېمە يوق. Your trash bin is empty!",
 "Delete" => "ئۆچۈر"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/uk.php b/apps/files_trashbin/l10n/uk.php
index aa4b65950323fffba703987029b83c41ccf884d5..c54d45aaa824f78c1478abb410e219c3313d8e9a 100644
--- a/apps/files_trashbin/l10n/uk.php
+++ b/apps/files_trashbin/l10n/uk.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Неможливо видалити %s назавжди",
 "Couldn't restore %s" => "Неможливо відновити %s",
-"perform restore operation" => "виконати операцію відновлення",
 "Error" => "Помилка",
-"delete file permanently" => "видалити файл назавжди",
-"Delete permanently" => "Видалити назавжди",
-"Name" => "Ім'я",
-"Deleted" => "Видалено",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
 "restored" => "відновлено",
 "Nothing in here. Your trash bin is empty!" => "Нічого немає. Ваший кошик для сміття пустий!",
+"Name" => "Ім'я",
 "Restore" => "Відновити",
+"Deleted" => "Видалено",
 "Delete" => "Видалити",
 "Deleted Files" => "Видалено Файлів"
 );
diff --git a/apps/files_trashbin/l10n/ur_PK.php b/apps/files_trashbin/l10n/ur_PK.php
index f6c6a3da3c84b3f5c08590b20530b8c2e84a5d01..49c82f53872c84830aff3465f8f713e57363bded 100644
--- a/apps/files_trashbin/l10n/ur_PK.php
+++ b/apps/files_trashbin/l10n/ur_PK.php
@@ -1,7 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Error" => "ایرر",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("","")
+"Error" => "ایرر"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/vi.php b/apps/files_trashbin/l10n/vi.php
index 072d799fa6819d0cedd041904f80463b338f9b83..c5e899392bfb2f2d40d045fd7d38b437cf313db4 100644
--- a/apps/files_trashbin/l10n/vi.php
+++ b/apps/files_trashbin/l10n/vi.php
@@ -2,16 +2,11 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Không thể óa %s vĩnh viễn",
 "Couldn't restore %s" => "Không thể khôi phục %s",
-"perform restore operation" => "thực hiện phục hồi",
 "Error" => "Lỗi",
-"delete file permanently" => "xóa file vĩnh viễn",
-"Delete permanently" => "Xóa vĩnh vễn",
-"Name" => "Tên",
-"Deleted" => "Đã xóa",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "Nothing in here. Your trash bin is empty!" => "Không có gì ở đây. Thùng rác của bạn rỗng!",
+"Name" => "Tên",
 "Restore" => "Khôi phục",
+"Deleted" => "Đã xóa",
 "Delete" => "Xóa",
 "Deleted Files" => "File đã xóa"
 );
diff --git a/apps/files_trashbin/l10n/zh_CN.php b/apps/files_trashbin/l10n/zh_CN.php
index dc2d5b4c00e8d1960d9dc6ec5132811ea3a15864..24d9002adcb224772a18fb0be594d69d4c46c53f 100644
--- a/apps/files_trashbin/l10n/zh_CN.php
+++ b/apps/files_trashbin/l10n/zh_CN.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "无法彻底删除文件%s",
 "Couldn't restore %s" => "无法恢复%s",
-"perform restore operation" => "执行恢复操作",
 "Error" => "错误",
-"delete file permanently" => "彻底删除文件",
-"Delete permanently" => "永久删除",
-"Name" => "名称",
-"Deleted" => "已删除",
-"_%n folder_::_%n folders_" => array("%n 文件夹"),
-"_%n file_::_%n files_" => array("%n个文件"),
 "restored" => "已恢复",
 "Nothing in here. Your trash bin is empty!" => "这里没有东西. 你的回收站是空的!",
+"Name" => "名称",
 "Restore" => "恢复",
+"Deleted" => "已删除",
 "Delete" => "删除",
 "Deleted Files" => "已删除文件"
 );
diff --git a/apps/files_trashbin/l10n/zh_HK.php b/apps/files_trashbin/l10n/zh_HK.php
index 3f0d663baeb10ee308c1ca65edae8e5bbd1a63c6..877912e9c4258c2cad4b24b1b4221fef8f383738 100644
--- a/apps/files_trashbin/l10n/zh_HK.php
+++ b/apps/files_trashbin/l10n/zh_HK.php
@@ -2,8 +2,6 @@
 $TRANSLATIONS = array(
 "Error" => "錯誤",
 "Name" => "名稱",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "Delete" => "刪除"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/zh_TW.php b/apps/files_trashbin/l10n/zh_TW.php
index bfc2fc659de35b74a49a5db6452b28f6004a24ba..1f05a2687b6a33851d5272212d1c0f8876fef4b3 100644
--- a/apps/files_trashbin/l10n/zh_TW.php
+++ b/apps/files_trashbin/l10n/zh_TW.php
@@ -2,17 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "無法永久刪除 %s",
 "Couldn't restore %s" => "無法還原 %s",
-"perform restore operation" => "進行還原動作",
 "Error" => "錯誤",
-"delete file permanently" => "永久刪除檔案",
-"Delete permanently" => "永久刪除",
-"Name" => "名稱",
-"Deleted" => "已刪除",
-"_%n folder_::_%n folders_" => array("%n 個資料夾"),
-"_%n file_::_%n files_" => array("%n 個檔案"),
 "restored" => "已還原",
 "Nothing in here. Your trash bin is empty!" => "您的回收桶是空的!",
+"Name" => "名稱",
 "Restore" => "還原",
+"Deleted" => "已刪除",
 "Delete" => "刪除",
 "Deleted Files" => "已刪除的檔案"
 );
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index 82ba0608834c95e6fcdc2632dd694235c90613b7..15ba074e45eefa42f1e21d8174de7a61cfd5dde1 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -1,4 +1,3 @@
-<!--[if IE 8]><style>input[type="checkbox"]{padding:0;}table td{position:static !important;}</style><![endif]-->
 <div id="controls">
 	<?php print_unescaped($_['breadcrumb']); ?>
 		<div id="file_action_panel"></div>
@@ -17,7 +16,9 @@
 	<thead>
 		<tr>
 			<th id='headerName'>
+				<div id="headerName-container">
 				<input type="checkbox" id="select_all" />
+				<label for="select_all"></label>
 				<span class='name'><?php p($l->t( 'Name' )); ?></span>
 				<span class='selectedActions'>
 						<a href="" class="undelete">
@@ -26,6 +27,7 @@
 							<?php p($l->t('Restore'))?>
 						</a>
 				</span>
+				</div>
 			</th>
 			<th id="headerDate">
 				<span id="modified"><?php p($l->t( 'Deleted' )); ?></span>
diff --git a/apps/files_versions/ajax/preview.php b/apps/files_versions/ajax/preview.php
index c24134df5347559513a2b53e344d05b33fb9a78d..62bcc03f522bcdee8777dc31952b59f1b6f1955f 100644
--- a/apps/files_versions/ajax/preview.php
+++ b/apps/files_versions/ajax/preview.php
@@ -12,25 +12,32 @@ if(!\OC_App::isEnabled('files_versions')){
 }
 
 $file = array_key_exists('file', $_GET) ? (string) urldecode($_GET['file']) : '';
+$user = array_key_exists('user', $_GET) ? $_GET['user'] : '';
 $maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : 44;
 $maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : 44;
 $version = array_key_exists('version', $_GET) ? $_GET['version'] : '';
 $scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true;
 
+if($user === '') {
+	\OC_Response::setStatus(400); //400 Bad Request
+	\OC_Log::write('versions-preview', 'No user parameter was passed', \OC_Log::DEBUG);
+	exit;
+}
+
 if($file === '' && $version === '') {
 	\OC_Response::setStatus(400); //400 Bad Request
-	\OC_Log::write('core-preview', 'No file parameter was passed', \OC_Log::DEBUG);
+	\OC_Log::write('versions-preview', 'No file parameter was passed', \OC_Log::DEBUG);
 	exit;
 }
 
 if($maxX === 0 || $maxY === 0) {
 	\OC_Response::setStatus(400); //400 Bad Request
-	\OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG);
+	\OC_Log::write('versions-preview', 'x and/or y set to 0', \OC_Log::DEBUG);
 	exit;
 }
 
 try{
-	$preview = new \OC\Preview(\OC_User::getUser(), 'files_versions');
+	$preview = new \OC\Preview($user, 'files_versions');
 	$preview->setFile($file.'.v'.$version);
 	$preview->setMaxX($maxX);
 	$preview->setMaxY($maxY);
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index fc8d0365c71da502084bd0355cf8b4b582cf30aa..225611374a6be832a76297cbfe613bcf2ef35093 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -19,6 +19,7 @@ class Storage {
 
 	const DEFAULTENABLED=true;
 	const DEFAULTMAXSIZE=50; // unit: percentage; 50% of available disk space/quota
+	const VERSIONS_ROOT = 'files_versions/';
 
 	private static $max_versions_per_interval = array(
 		//first 10sec, one version every 2sec
@@ -238,60 +239,38 @@ class Storage {
 	 * @param $filename file to find versions of, relative to the user files dir
 	 * @returns array
 	 */
-	public static function getVersions($uid, $filename ) {
-		if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
-			$versions_fileview = new \OC\Files\View('/' . $uid . '/files_versions');
-			$versionsName = $versions_fileview->getLocalFile($filename).'.v';
-			$escapedVersionName = preg_replace('/(\*|\?|\[)/', '[$1]', $versionsName);
-
-			$versions = array();
-			// fetch for old versions
-			$matches = glob($escapedVersionName.'*');
-
-			if ( !$matches ) {
-				return $versions;
-			}
-
-			sort( $matches );
-
-			$files_view = new \OC\Files\View('/'.$uid.'/files');
-			$local_file = $files_view->getLocalFile($filename);
-			$local_file_md5 = \md5_file( $local_file );
-
-			foreach( $matches as $ma ) {
-				$parts = explode( '.v', $ma );
-				$version = ( end( $parts ) );
-				$key = $version.'#'.$filename;
-				$versions[$key]['cur'] = 0;
-				$versions[$key]['version'] = $version;
-				$versions[$key]['humanReadableTimestamp'] = self::getHumanReadableTimestamp($version);
-				$versions[$key]['path'] = $filename;
-				$versions[$key]['preview'] = \OCP\Util::linkToRoute('core_ajax_versions_preview', array('file' => $filename, 'version' => $version));
-				$versions[$key]['size'] = $versions_fileview->filesize($filename.'.v'.$version);
-
-				// if file with modified date exists, flag it in array as currently enabled version
-				( \md5_file( $ma ) == $local_file_md5 ? $versions[$key]['fileMatch'] = 1 : $versions[$key]['fileMatch'] = 0 );
-
-			}
-
-			// newest versions first
-			$versions = array_reverse( $versions );
-
-			foreach( $versions as $key => $value ) {
-				// flag the first matched file in array (which will have latest modification date) as current version
-				if ( $value['fileMatch'] ) {
-					$value['cur'] = 1;
-					break;
+	public static function getVersions($uid, $filename) {
+		$versions = array();
+		// fetch for old versions
+		$view = new \OC\Files\View('/' . $uid . '/' . self::VERSIONS_ROOT);
+
+		$pathinfo = pathinfo($filename);
+
+		$files = $view->getDirectoryContent($pathinfo['dirname']);
+
+		$versionedFile = $pathinfo['basename'];
+
+		foreach ($files as $file) {
+			if ($file['type'] === 'file') {
+				$pos = strrpos($file['path'], '.v');
+				$currentFile = substr($file['name'], 0, strrpos($file['name'], '.v'));
+				if ($currentFile === $versionedFile) {
+					$version = substr($file['path'], $pos + 2);
+					$key = $version . '#' . $filename;
+					$versions[$key]['cur'] = 0;
+					$versions[$key]['version'] = $version;
+					$versions[$key]['humanReadableTimestamp'] = self::getHumanReadableTimestamp($version);
+					$versions[$key]['preview'] = \OCP\Util::linkToRoute('core_ajax_versions_preview', array('file' => $filename, 'version' => $version, 'user' => $uid));
+					$versions[$key]['path'] = $filename;
+					$versions[$key]['size'] = $file['size'];
 				}
 			}
-
-			return( $versions );
-
-		} else {
-			// if versioning isn't enabled then return an empty array
-			return( array() );
 		}
 
+		// sort with newest version first
+		krsort($versions);
+
+		return $versions;
 	}
 
 	/**
@@ -366,48 +345,45 @@ class Storage {
 	 * @return array with contains two arrays 'all' which contains all versions sorted by age and 'by_file' which contains all versions sorted by filename
 	 */
 	private static function getAllVersions($uid) {
-		if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
-			$versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions');
-			$versionsRoot = $versions_fileview->getLocalFolder('');
+		$view = new \OC\Files\View('/' . $uid . '/');
+		$dirs = array(self::VERSIONS_ROOT);
 
-			$iterator = new \RecursiveIteratorIterator(
-				new \RecursiveDirectoryIterator($versionsRoot),
-				\RecursiveIteratorIterator::CHILD_FIRST
-			);
+		while (!empty($dirs)) {
+			$dir = array_pop($dirs);
+			$files = $view->getDirectoryContent($dir);
 
-			$versions = array();
-
-			foreach ($iterator as $path) {
-				if ( preg_match('/^.+\.v(\d+)$/', $path, $match) ) {
-					$relpath = substr($path, strlen($versionsRoot)-1);
-					$versions[$match[1].'#'.$relpath] = array('path' => $relpath, 'timestamp' => $match[1]);
+			foreach ($files as $file) {
+				if ($file['type'] === 'dir') {
+					array_push($dirs, $file['path']);
+				} else {
+					$versionsBegin = strrpos($file['path'], '.v');
+					$relPathStart = strlen(self::VERSIONS_ROOT);
+					$version = substr($file['path'], $versionsBegin + 2);
+					$relpath = substr($file['path'], $relPathStart, $versionsBegin - $relPathStart);
+					$key = $version . '#' . $relpath;
+					$versions[$key] = array('path' => $relpath, 'timestamp' => $version);
 				}
 			}
+		}
 
-			ksort($versions);
-
-			$i = 0;
-
-			$result = array();
-
-			foreach( $versions as $key => $value ) {
-				$i++;
-				$size = $versions_fileview->filesize($value['path']);
-				$filename = substr($value['path'], 0, -strlen($value['timestamp'])-2);
+		ksort($versions);
 
-				$result['all'][$key]['version'] = $value['timestamp'];
-				$result['all'][$key]['path'] = $filename;
-				$result['all'][$key]['size'] = $size;
+		$result = array();
 
-				$filename = substr($value['path'], 0, -strlen($value['timestamp'])-2);
-				$result['by_file'][$filename][$key]['version'] = $value['timestamp'];
-				$result['by_file'][$filename][$key]['path'] = $filename;
-				$result['by_file'][$filename][$key]['size'] = $size;
+		foreach ($versions as $key => $value) {
+			$size = $view->filesize($value['path']);
+			$filename = $value['path'];
 
-			}
+			$result['all'][$key]['version'] = $value['timestamp'];
+			$result['all'][$key]['path'] = $filename;
+			$result['all'][$key]['size'] = $size;
 
-			return $result;
+			$result['by_file'][$filename][$key]['version'] = $value['timestamp'];
+			$result['by_file'][$filename][$key]['path'] = $filename;
+			$result['by_file'][$filename][$key]['size'] = $size;
 		}
+
+		return $result;
 	}
 
 	/**
diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
index 179451dad69e48cd5ab24b4f12994c69720c58b6..41770cf97b16209ba74660d2b7859b309624a911 100644
--- a/apps/user_ldap/appinfo/update.php
+++ b/apps/user_ldap/appinfo/update.php
@@ -1,20 +1,5 @@
 <?php
 
-//from version 0.1 to 0.2
-
-//ATTENTION
-//Upgrade from ownCloud 3 (LDAP backend 0.1) to ownCloud 4.5 (LDAP backend 0.3) is not supported!!
-//You must do upgrade to ownCloud 4.0 first!
-//The upgrade stuff in the section from 0.1 to 0.2 is just to minimize the bad effects.
-
-//settings
-$pw = OCP\Config::getAppValue('user_ldap', 'ldap_password');
-if(!is_null($pw)) {
-	$pwEnc = base64_encode($pw);
-	OCP\Config::setAppValue('user_ldap', 'ldap_agent_password', $pwEnc);
-	OC_Appconfig::deleteKey('user_ldap', 'ldap_password');
-}
-
 //detect if we can switch on naming guidelines. We won't do it on conflicts.
 //it's a bit spaghetti, but hey.
 $state = OCP\Config::getSystemValue('ldapIgnoreNamingRules', 'unset');
@@ -22,75 +7,21 @@ if($state === 'unset') {
 	OCP\Config::setSystemValue('ldapIgnoreNamingRules', false);
 }
 
-//from version 0.2 to 0.3 (0.2.0.x dev version)
-$objects = array('user', 'group');
-
-$connector = new \OCA\user_ldap\lib\Connection();
-$userBE = new \OCA\user_ldap\USER_LDAP();
-$userBE->setConnector($connector);
-$groupBE = new \OCA\user_ldap\GROUP_LDAP();
-$groupBE->setConnector($connector);
-
-foreach($objects as $object) {
-	$fetchDNSql = '
-		SELECT `ldap_dn`, `owncloud_name`, `directory_uuid`
-		FROM `*PREFIX*ldap_'.$object.'_mapping`';
-	$updateSql = '
-		UPDATE `*PREFIX*ldap_'.$object.'_mapping`
-		SET `ldap_DN` = ?, `directory_uuid` = ?
-		WHERE `ldap_dn` = ?';
-
-	$query = OCP\DB::prepare($fetchDNSql);
-	$res = $query->execute();
-	$DNs = $res->fetchAll();
-	$updateQuery = OCP\DB::prepare($updateSql);
-	foreach($DNs as $dn) {
-		$newDN = escapeDN(mb_strtolower($dn['ldap_dn'], 'UTF-8'));
-		if(!empty($dn['directory_uuid'])) {
-			$uuid = $dn['directory_uuid'];
-		} elseif($object === 'user') {
-			$uuid = $userBE->getUUID($newDN);
-			//fix home folder to avoid new ones depending on the configuration
-			$userBE->getHome($dn['owncloud_name']);
-		} else {
-			$uuid = $groupBE->getUUID($newDN);
-		}
-		try {
-			$updateQuery->execute(array($newDN, $uuid, $dn['ldap_dn']));
-		} catch(Exception $e) {
-			\OCP\Util::writeLog('user_ldap',
-				'Could not update '.$object.' '.$dn['ldap_dn'].' in the mappings table. ',
-				\OCP\Util::WARN);
-		}
-
-	}
-}
-
-function escapeDN($dn) {
-	$aDN = ldap_explode_dn($dn, false);
-	unset($aDN['count']);
-	foreach($aDN as $key => $part) {
-		$value = substr($part, strpos($part, '=')+1);
-		$escapedValue = strtr($value, Array(','=>'\2c', '='=>'\3d', '+'=>'\2b',
-			'<'=>'\3c', '>'=>'\3e', ';'=>'\3b', '\\'=>'\5c',
-			'"'=>'\22', '#'=>'\23'));
-		$part = str_replace($part, $value, $escapedValue);
-	}
-	$dn = implode(',', $aDN);
-
-	return $dn;
-}
-
-
-// SUPPORTED UPGRADE FROM Version 0.3 (ownCloud 4.5) to 0.4 (ownCloud 5)
-
-if(!isset($connector)) {
-	$connector = new \OCA\user_ldap\lib\Connection();
+$configPrefixes = OCA\user_ldap\lib\Helper::getServerConfigurationPrefixes(true);
+$ldap = new OCA\user_ldap\lib\LDAP();
+foreach($configPrefixes as $config) {
+	$connection = new OCA\user_ldap\lib\Connection($ldap, $config);
+	$value = \OCP\Config::getAppValue('user_ldap',
+									  $config.'ldap_uuid_attribute', 'auto');
+	\OCP\Config::setAppValue('user_ldap',
+							 $config.'ldap_uuid_user_attribute', $value);
+	\OCP\Config::setAppValue('user_ldap',
+							 $config.'ldap_uuid_group_attribute', $value);
+
+	$value = \OCP\Config::getAppValue('user_ldap',
+									  $config.'ldap_expert_uuid_attr', 'auto');
+	\OCP\Config::setAppValue('user_ldap',
+							 $config.'ldap_expert_uuid_user_attr', $value);
+	\OCP\Config::setAppValue('user_ldap',
+							 $config.'ldap_expert_uuid_group_attr', $value);
 }
-//it is required, that connections do have ldap_configuration_active setting stored in the database
-$connector->getConfiguration();
-$connector->saveConfiguration();
-
-// we don't save it anymore, was a well-meant bad idea. Clean up database.
-$query = OC_DB::prepare('DELETE FROM `*PREFIX*preferences` WHERE `appid` = ? AND `configkey` = ?');
-$query->execute(array('user_ldap' , 'homedir'));
diff --git a/apps/user_ldap/appinfo/version b/apps/user_ldap/appinfo/version
index 60a2d3e96c80e344efb192a6536f018f6deef60a..44bb5d1f74358758e75a906eebebb458e9de7fcb 100644
--- a/apps/user_ldap/appinfo/version
+++ b/apps/user_ldap/appinfo/version
@@ -1 +1 @@
-0.4.0
\ No newline at end of file
+0.4.1
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index 455ad62d84c9678eefcfe530a55cde62d70e1e50..36a06b99da95cd00f8c13ce10c52522328cc612e 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -76,7 +76,6 @@ $TRANSLATIONS = array(
 "Internal Username Attribute:" => "Atribut nom d'usuari intern:",
 "Override UUID detection" => "Sobrescriu la detecció UUID",
 "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Per defecte, owncloud autodetecta l'atribut UUID. L'atribut UUID s'utilitza per identificar usuaris i grups de forma indubtable. També el nom d'usuari intern es crearà en base a la UUIS, si no heu especificat res diferent a dalt. Podeu sobreescriure l'arranjament i passar l'atribut que desitgeu. Heu d'assegurar-vos que l'atribut que escolliu pot ser recollit tant pels usuaris com pels grups i que és únic. Deixeu-ho en blanc si preferiu el comportament per defecte. els canvis s'aplicaran als usuaris i grups LDAP mapats de nou (afegits).",
-"UUID Attribute:" => "Atribut UUID:",
 "Username-LDAP User Mapping" => "Mapatge d'usuari Nom d'usuari-LDAP",
 "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Els noms d'usuari s'usen per desar i assignar (meta)dades. Per tal d'identificar amb precisió i reconèixer els usuaris, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix mapatge del nom d'usuari a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. A més, la DN es posa a la memòria de cau per reduir la interacció LDAP, però no s'usa per identificació. En cas que la DN canvïi, els canvis es trobaran. El nom d'usuari intern s'usa a tot arreu. Si esborreu els mapatges quedaran sobrants a tot arreu. Esborrar els mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No esborreu mai els mapatges en un entorn de producció, només en un estadi de prova o experimental.",
 "Clear Username-LDAP User Mapping" => "Elimina el mapatge d'usuari Nom d'usuari-LDAP",
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index 9109a8c710a82e09152ca0ec3a72ebb0940c6b04..be84aa2b647109c6508936dac7b4810491027772 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -76,7 +76,6 @@ $TRANSLATIONS = array(
 "Internal Username Attribute:" => "Atribut interního uživatelského jména:",
 "Override UUID detection" => "Nastavit ručně UUID atribut",
 "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Ve výchozím nastavení je UUID atribut nalezen automaticky. UUID atribut je používán pro nezpochybnitelnou identifikaci uživatelů a skupin z LDAP. Navíc je na základě UUID tvořeno také interní uživatelské jméno, pokud není nastaveno jinak. Můžete výchozí nastavení přepsat a použít atribut, který sami zvolíte. Musíte se ale ujistit, že atribut, který vyberete, bude uveden jak u uživatelů, tak i u skupin a je unikátní. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele a skupiny z LDAP.",
-"UUID Attribute:" => "Atribut UUID:",
 "Username-LDAP User Mapping" => "Mapování uživatelských jmen z LDAPu",
 "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Uživatelská jména jsou používány pro uchovávání a přiřazování (meta)dat. Pro správnou identifikaci a rozpoznání uživatelů bude mít každý uživatel z LDAP interní uživatelské jméno. To vyžaduje mapování uživatelských jmen na uživatele LDAP. Vytvořené uživatelské jméno je mapováno na UUID uživatele v LDAP. Navíc je cachována DN pro zmenšení interakce s LDAP, ale není používána pro identifikaci. Pokud se DN změní, bude to správně rozpoznáno. Interní uživatelské jméno se používá celé. Vyčištění mapování zanechá zbytky všude. Vyčištění navíc není specifické konfiguraci, bude mít vliv na všechny LDAP konfigurace! Nikdy nečistěte mapování v produkčním prostředí, jen v testovací nebo experimentální fázi.",
 "Clear Username-LDAP User Mapping" => "Zrušit mapování uživatelských jmen LDAPu",
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index cb13275fafa46e7fb7bdc2dd1fef3eec7997e44b..77f77b711500895a51150b226bc56fbce9dea14c 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -76,7 +76,8 @@ $TRANSLATIONS = array(
 "Internal Username Attribute:" => "Attribut für interne Benutzernamen:",
 "Override UUID detection" => "UUID-Erkennung überschreiben",
 "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Standardmäßig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Außerdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Du musst allerdings sicherstellen, dass deine gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lasse es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus.",
-"UUID Attribute:" => "UUID-Attribut:",
+"UUID Attribute for Users:" => "UUID-Attribute für Benutzer:",
+"UUID Attribute for Groups:" => "UUID-Attribute für Gruppen:",
 "Username-LDAP User Mapping" => "LDAP-Benutzernamenzuordnung",
 "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Lösche die Zuordnungen nur in einer Test- oder Experimentierumgebung.",
 "Clear Username-LDAP User Mapping" => "Lösche LDAP-Benutzernamenzuordnung",
diff --git a/apps/user_ldap/l10n/de_CH.php b/apps/user_ldap/l10n/de_CH.php
index df9175e73b1d399c6c7561e3f5fc57ba5b7d7b21..28971ed9e42d5d75a17db6953a8674322dbea9fa 100644
--- a/apps/user_ldap/l10n/de_CH.php
+++ b/apps/user_ldap/l10n/de_CH.php
@@ -76,7 +76,6 @@ $TRANSLATIONS = array(
 "Internal Username Attribute:" => "Interne Eigenschaften des Benutzers:",
 "Override UUID detection" => "UUID-Erkennung überschreiben",
 "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Standardmässig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Ausserdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie müssen allerdings sicherstellen, dass Ihre gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus.",
-"UUID Attribute:" => "UUID-Attribut:",
 "Username-LDAP User Mapping" => "LDAP-Benutzernamenzuordnung",
 "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Löschen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung.",
 "Clear Username-LDAP User Mapping" => "Lösche LDAP-Benutzernamenzuordnung",
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index 677d603ffa0a7e1103895ef1ef216b65d48e21bc..a2ee5bbd2a66ccf5e6a400115c7237a17fd111e4 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -76,7 +76,8 @@ $TRANSLATIONS = array(
 "Internal Username Attribute:" => "Interne Eigenschaften des Benutzers:",
 "Override UUID detection" => "UUID-Erkennung überschreiben",
 "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Standardmäßig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Außerdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie müssen allerdings sicherstellen, dass Ihre gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus.",
-"UUID Attribute:" => "UUID-Attribut:",
+"UUID Attribute for Users:" => "UUID-Attribute für Benutzer:",
+"UUID Attribute for Groups:" => "UUID-Attribute für Gruppen:",
 "Username-LDAP User Mapping" => "LDAP-Benutzernamenzuordnung",
 "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Löschen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung.",
 "Clear Username-LDAP User Mapping" => "Lösche LDAP-Benutzernamenzuordnung",
diff --git a/apps/user_ldap/l10n/en_GB.php b/apps/user_ldap/l10n/en_GB.php
index d613be34868158b1386040061e459435952527ec..3be8add83ec3b58a502149ec01dbd3d54e49e969 100644
--- a/apps/user_ldap/l10n/en_GB.php
+++ b/apps/user_ldap/l10n/en_GB.php
@@ -76,7 +76,6 @@ $TRANSLATIONS = array(
 "Internal Username Attribute:" => "Internal Username Attribute:",
 "Override UUID detection" => "Override UUID detection",
 "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "By default, the UUID attribute is automatically detected. The UUID attribute is used to unambiguously identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups.",
-"UUID Attribute:" => "UUID Attribute:",
 "Username-LDAP User Mapping" => "Username-LDAP User Mapping",
 "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Usernames are used to store and assign (meta) data. In order to precisely identify and recognise users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage.",
 "Clear Username-LDAP User Mapping" => "Clear Username-LDAP User Mapping",
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index 4f37d5177a79a5015fb08e09dd7ffca9090bfb73..537ee1e4bd156c59eef05a38aaff048ee5343f24 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -76,7 +76,6 @@ $TRANSLATIONS = array(
 "Internal Username Attribute:" => "Atributo Nombre de usuario Interno:",
 "Override UUID detection" => "Sobrescribir la detección UUID",
 "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por defecto, el atributo UUID es autodetectado. Este atributo es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los usuarios y grupos de LDAP mapeados (añadidos) recientemente.",
-"UUID Attribute:" => "Atributo UUID:",
 "Username-LDAP User Mapping" => "Asignación del Nombre de usuario de un usuario LDAP",
 "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Los usuarios son usados para almacenar y asignar (meta) datos. Con el fin de identificar de forma precisa y reconocer usuarios, cada usuario de LDAP tendrá un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es cacheado para reducir la interacción entre el LDAP, pero no es usado para identificar. Si el DN cambia, los cambios serán aplicados. El nombre de usuario interno es usado por encima de todo. Limpiar los mapeos dejará restos por todas partes, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, únicamente en una fase de desarrollo o experimental.",
 "Clear Username-LDAP User Mapping" => "Borrar la asignación de los Nombres de usuario de los usuarios LDAP",
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
index 2436df8de7747baf96c523b2f96e34975a7385c3..c9ea9184b418895468f65a884853dfe36b4a5227 100644
--- a/apps/user_ldap/l10n/es_AR.php
+++ b/apps/user_ldap/l10n/es_AR.php
@@ -76,7 +76,6 @@ $TRANSLATIONS = array(
 "Internal Username Attribute:" => "Atributo Nombre Interno de usuario:",
 "Override UUID detection" => "Sobrescribir la detección UUID",
 "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por defecto, el atributo UUID es detectado automáticamente. Este atributo es usado para identificar de manera certera usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no fue especificado otro comportamiento más arriba. Podés sobrescribir la configuración y pasar un atributo de tu elección. Tenés que asegurarte que el atributo de tu elección sea accesible por los usuarios y grupos y que sea único. Dejalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto sólo en los nuevos usuarios y grupos de LDAP mapeados (agregados).",
-"UUID Attribute:" => "Atributo UUID:",
 "Username-LDAP User Mapping" => "Asignación del Nombre de usuario de un usuario LDAP",
 "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Los usuarios son usados para almacenar y asignar datos (metadatos). Con el fin de identificar de forma precisa y reconocer usuarios, a cada usuario de LDAP se será asignado un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es dejado en caché para reducir la interacción entre el LDAP, pero no es usado para la identificación. Si el DN cambia, los cambios van a ser aplicados. El nombre de usuario interno es usado en todos los lugares. Vaciar los mapeos, deja restos por todas partes. Vaciar los mapeos, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, solamente en fase de desarrollo o experimental.",
 "Clear Username-LDAP User Mapping" => "Borrar la asignación de los Nombres de usuario de los usuarios LDAP",
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
index b949fe02041daf2af4818d8cc328bf97f7c930a8..943ad0bc1199234d01ef430e8638c73bb83d8c8d 100644
--- a/apps/user_ldap/l10n/et_EE.php
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -76,7 +76,6 @@ $TRANSLATIONS = array(
 "Internal Username Attribute:" => "Sisemise kasutajatunnuse atribuut:",
 "Override UUID detection" => "Tühista UUID tuvastus",
 "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Vaikimis ownCloud tuvastab automaatselt UUID atribuudi. UUID atribuuti kasutatakse LDAP kasutajate ja gruppide kindlaks tuvastamiseks. Samuti tekitatakse sisemine kasutajanimi UUID alusel, kui pole määratud teisiti. Sa saad tühistada selle seadistuse ning määrata atribuudi omal valikul. Pead veenduma, et valitud atribuut toimib nii kasutajate kui gruppide puhul ning on unikaalne. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi (lisatud) LDAP kasutajate vastendusi.",
-"UUID Attribute:" => "UUID atribuut:",
 "Username-LDAP User Mapping" => "LDAP-Kasutajatunnus Kasutaja Vastendus",
 "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "ownCloud kasutab kasutajanime talletamaks ja omistamaks (pseudo) andmeid. Et täpselt tuvastada ja määratleda kasutajaid, peab iga LDAP kasutaja omama sisemist kasutajatunnust. See vajab ownCloud kasutajatunnuse vastendust LDAP kasutajaks. Tekitatud kasutajanimi vastendatakse LDAP kasutaja UUID-iks. Lisaks puhverdatakse DN vähendamaks LDAP päringuid, kuid seda ei kasutata tuvastamisel. ownCloud suudab tuvastada ka DN muutumise. ownCloud sisemist kasutajatunnust kasutatakse üle kogu ownCloudi. Eemaldates vastenduse tekivad kõikjal andmejäägid. Vastenduste eemaldamine ei ole konfiguratsiooni tundlik, see mõjutab kõiki LDAP seadistusi! Ära kunagi eemalda vastendusi produktsioonis! Seda võid teha ainult testis või katsetuste masinas.",
 "Clear Username-LDAP User Mapping" => "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus",
diff --git a/apps/user_ldap/l10n/fa.php b/apps/user_ldap/l10n/fa.php
index c4db39521ddd1abae7ea364e743f82bb643e966b..89bbe5170b8941a583db0341294dd15613bbcc2c 100644
--- a/apps/user_ldap/l10n/fa.php
+++ b/apps/user_ldap/l10n/fa.php
@@ -57,7 +57,6 @@ $TRANSLATIONS = array(
 "Internal Username" => "نام کاربری داخلی",
 "Internal Username Attribute:" => "ویژگی نام کاربری داخلی:",
 "Override UUID detection" => "نادیده گرفتن تشخیص UUID ",
-"UUID Attribute:" => "صفت UUID:",
 "Username-LDAP User Mapping" => "نام کاربری - نگاشت کاربر LDAP ",
 "Clear Username-LDAP User Mapping" => "پاک کردن نام کاربری- LDAP  نگاشت کاربر ",
 "Clear Groupname-LDAP Group Mapping" => "پاک کردن نام گروه -LDAP گروه نقشه برداری",
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index 8b6027b81e6dda2c16df98ffb705ec60510ea692..e33558a9d2a72682760231b89be1c44ab7e2bbee 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -76,7 +76,8 @@ $TRANSLATIONS = array(
 "Internal Username Attribute:" => "Nom d'utilisateur interne:",
 "Override UUID detection" => "Surcharger la détection d'UUID",
 "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Par défaut, l'attribut UUID est automatiquement  détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP.",
-"UUID Attribute:" => "Attribut UUID :",
+"UUID Attribute for Users:" => "Attribut UUID pour les utilisateurs :",
+"UUID Attribute for Groups:" => "Attribut UUID pour les groupes :",
 "Username-LDAP User Mapping" => "Association Nom d'utilisateur-Utilisateur LDAP",
 "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Les noms d'utilisateurs sont utilisés pour le stockage et l'assignation de (meta) données. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur LDAP aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs, le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. Si le DN est modifié, ces modifications seront retrouvées. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mais uniquement sur des environnements de tests et d'expérimentation.",
 "Clear Username-LDAP User Mapping" => "Supprimer l'association utilisateur interne-utilisateur LDAP",
diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php
index 911e481ca76f477eea7fe419025b9365842d6a7a..0b70984c1aba4f4f9bc2ad2e918c2250e3031ba0 100644
--- a/apps/user_ldap/l10n/gl.php
+++ b/apps/user_ldap/l10n/gl.php
@@ -76,7 +76,8 @@ $TRANSLATIONS = array(
 "Internal Username Attribute:" => "Atributo do nome de usuario interno:",
 "Override UUID detection" => "Ignorar a detección do UUID",
 "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "De xeito predeterminado, o atributo UUID é detectado automaticamente. O atributo UUID utilizase para identificar, sen dúbida, aos usuarios e grupos LDAP. Ademais, crearase o usuario interno baseado no UUID, se non se especifica anteriormente o contrario. Pode anular a configuración e pasar un atributo da súa escolla. Vostede debe asegurarse de que o atributo da súa escolla pode ser recuperado polos usuarios e grupos e de que é único. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP.",
-"UUID Attribute:" => "Atributo do UUID:",
+"UUID Attribute for Users:" => "Atributo do UUID para usuarios:",
+"UUID Attribute for Groups:" => "Atributo do UUID para grupos:",
 "Username-LDAP User Mapping" => "Asignación do usuario ao «nome de usuario LDAP»",
 "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Os nomes de usuario empreganse para almacenar e asignar (meta) datos. Coa fin de identificar con precisión e recoñecer aos usuarios, cada usuario LDAP terá un nome de usuario interno. Isto require unha asignación de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na caché, para así reducir a interacción do LDAP, mais non se utiliza para a identificación. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignacións deixará rastros en todas partes. A limpeza das asignacións non é sensíbel á configuración, afecta a todas as configuracións de LDAP! Non limpar nunca as asignacións nun entorno de produción. Limpar as asignacións só en fases de proba ou experimentais.",
 "Clear Username-LDAP User Mapping" => "Limpar a asignación do usuario ao «nome de usuario LDAP»",
diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php
index b43dcbc2c8769cbed8d6b2a23b6bb23e24479758..84f8ca948efe11bfe256b9074c87b31bcd83b7d5 100644
--- a/apps/user_ldap/l10n/hu_HU.php
+++ b/apps/user_ldap/l10n/hu_HU.php
@@ -75,7 +75,6 @@ $TRANSLATIONS = array(
 "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Alapértelmezetten a belső felhasználónév az UUID tulajdonságból jön létre. Ez biztosítja a felhasználónév egyediségét és hogy a nem kell konvertálni a karaktereket benne. A belső felhasználónévnél a megkötés az, hogy csak a következő karakterek engdélyezettek benne: [ a-zA-Z0-9_.@- ]. Ezeken a karaktereken kivül minden karakter le lesz cserélve az adott karakter ASCII kódtáblában használható párjára vagy ha ilyen nincs akkor egyszerűen ki lesz hagyva. Ha így mégis ütköznének a nevek akkor hozzá lesz füzve egy folyamatosan növekvő számláló rész. A  belső felhasználónevet lehet használni a felhasználó azonosítására a programon belül. Illetve ez lesz az alapáértelmezett neve a felhasználó kezdő könyvtárának az ownCloud-ban. Illetve...............................",
 "Internal Username Attribute:" => "A belső felhasználónév attribútuma:",
 "Override UUID detection" => "Az UUID-felismerés felülbírálása",
-"UUID Attribute:" => "UUID attribútum:",
 "Username-LDAP User Mapping" => "Felhasználó - LDAP felhasználó hozzárendelés",
 "Clear Username-LDAP User Mapping" => "A felhasználó - LDAP felhasználó hozzárendelés törlése",
 "Clear Groupname-LDAP Group Mapping" => "A csoport - LDAP csoport hozzárendelés törlése",
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index 4b47846f2270190b0a2de46efb62745c46e91774..914cc3d32aef43ca460e2873559cdac39113fa5d 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -76,7 +76,6 @@ $TRANSLATIONS = array(
 "Internal Username Attribute:" => "Attributo nome utente interno:",
 "Override UUID detection" => "Ignora rilevamento UUID",
 "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "In modo predefinito, l'attributo UUID viene rilevato automaticamente. L'attributo UUID è utilizzato per identificare senza alcun dubbio gli utenti e i gruppi LDAP. Inoltre, il nome utente interno sarà creato sulla base dell'UUID, se non è specificato in precedenza. Puoi ignorare l'impostazione e fornire un attributo di tua scelta. Assicurati che l'attributo scelto possa essere ottenuto sia per gli utenti che per i gruppi e che sia univoco. Lascialo vuoto per ottenere il comportamento predefinito. Le modifiche avranno effetto solo sui nuovi utenti e gruppi LDAP associati (aggiunti).",
-"UUID Attribute:" => "Attributo UUID:",
 "Username-LDAP User Mapping" => "Associazione Nome utente-Utente LDAP",
 "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "I nomi utente sono utilizzati per archiviare e assegnare i (meta) dati. Per identificare con precisione e riconoscere gli utenti, ogni utente LDAP avrà un nome utente interno. Ciò richiede un'associazione tra il nome utente e l'utente LDAP. In aggiunta, il DN viene mantenuto in cache per ridurre l'interazione con LDAP, ma non è utilizzato per l'identificazione. Se il DN cambia, le modifiche saranno rilevate. Il nome utente interno è utilizzato dappertutto. La cancellazione delle associazioni lascerà tracce residue ovunque e interesserà esclusivamente la configurazione LDAP. Non cancellare mai le associazioni in un ambiente di produzione, ma solo in una fase sperimentale o di test.",
 "Clear Username-LDAP User Mapping" => "Cancella associazione Nome utente-Utente LDAP",
diff --git a/apps/user_ldap/l10n/ja_JP.php b/apps/user_ldap/l10n/ja_JP.php
index e9ef2165bb37e7445064b7af99541f5bcea149f4..904a93e1c2e7a724f988d93383b57a73564a3eb7 100644
--- a/apps/user_ldap/l10n/ja_JP.php
+++ b/apps/user_ldap/l10n/ja_JP.php
@@ -76,7 +76,6 @@ $TRANSLATIONS = array(
 "Internal Username Attribute:" => "内部ユーザ名属性:",
 "Override UUID detection" => "UUID検出を再定義する",
 "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "デフォルトでは、UUID 属性は自動的に検出されます。UUID属性は、LDAPユーザとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザ名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング(追加)されたLDAPユーザとLDAPグループに対してのみ有効となります。",
-"UUID Attribute:" => "UUID属性:",
 "Username-LDAP User Mapping" => "ユーザ名とLDAPユーザのマッピング",
 "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "ユーザ名は(メタ)データの保存と割り当てに使用されます。ユーザを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ユーザ名からLDAPユーザへのマッピングが必要であることを意味しています。この生成されたユーザ名は、LDAPユーザのUUIDにマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更が検出されます。内部ユーザ名は全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全てのLDAPの設定に影響を与えます!本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。",
 "Clear Username-LDAP User Mapping" => "ユーザ名とLDAPユーザのマッピングをクリアする",
diff --git a/apps/user_ldap/l10n/lt_LT.php b/apps/user_ldap/l10n/lt_LT.php
index f0522016825353a2bfbf26997d39c68a0e694928..05edf75e8b9047653fb1d8d237c154635c926de3 100644
--- a/apps/user_ldap/l10n/lt_LT.php
+++ b/apps/user_ldap/l10n/lt_LT.php
@@ -47,7 +47,6 @@ $TRANSLATIONS = array(
 "Internal Username" => "Vidinis naudotojo vardas",
 "Internal Username Attribute:" => "Vidinis naudotojo vardo atributas:",
 "Override UUID detection" => "Perrašyti UUID aptikimą",
-"UUID Attribute:" => "UUID atributas:",
 "Username-LDAP User Mapping" => "Naudotojo vardo - LDAP naudotojo sąsaja",
 "Clear Username-LDAP User Mapping" => "Išvalyti naudotojo vardo - LDAP naudotojo sąsają",
 "Clear Groupname-LDAP Group Mapping" => "Išvalyti grupės pavadinimo - LDAP naudotojo sąsają",
diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php
index b56dcf157912106fd4fa78c62a8b0abce49361a5..05e3b5f3429922b3a7c4627e0bcba5d80afabc51 100644
--- a/apps/user_ldap/l10n/nl.php
+++ b/apps/user_ldap/l10n/nl.php
@@ -76,7 +76,8 @@ $TRANSLATIONS = array(
 "Internal Username Attribute:" => "Interne gebruikersnaam attribuut:",
 "Override UUID detection" => "Negeren UUID detectie",
 "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Standaard herkent ownCloud het UUID-attribuut automatisch. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij deze hierboven anders is aangegeven. U kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. U moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw gekoppelde (toegevoegde) LDAP-gebruikers en-groepen.",
-"UUID Attribute:" => "UUID Attribuut:",
+"UUID Attribute for Users:" => "UUID attribuut voor gebruikers:",
+"UUID Attribute for Groups:" => "UUID attribuut voor groepen:",
 "Username-LDAP User Mapping" => "Gebruikersnaam-LDAP gebruikers vertaling",
 "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "ownCloud maakt gebruik van gebruikersnamen om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, krijgt elke LDAP-gebruiker ook een interne gebruikersnaam. Dit vereist een koppeling van de ownCloud gebruikersnaam aan een ​​LDAP-gebruiker. De gecreëerde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Aanvullend wordt ook de 'DN' gecached om het aantal LDAP-interacties te verminderen, maar dit wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden. De interne naam wordt overal gebruikt. Het wissen van de koppeling zal overal resten achterlaten. Het wissen van koppelingen is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze koppelingen nooit in een productieomgeving gewist worden. Maak ze alleen leeg in een test- of ontwikkelomgeving.",
 "Clear Username-LDAP User Mapping" => "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling",
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
index 7801f73dc1240c77680752cbfef8f304435af7a8..7e11e6cfc7341ca8d89c4440c49a5275fabffdee 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -66,7 +66,6 @@ $TRANSLATIONS = array(
 "Internal Username" => "Wewnętrzna nazwa użytkownika",
 "Internal Username Attribute:" => "Wewnętrzny atrybut nazwy uzżytkownika:",
 "Override UUID detection" => "Zastąp wykrywanie UUID",
-"UUID Attribute:" => "Atrybuty UUID:",
 "Username-LDAP User Mapping" => "Mapowanie użytkownika LDAP",
 "Clear Username-LDAP User Mapping" => "Czyść Mapowanie użytkownika LDAP",
 "Clear Groupname-LDAP Group Mapping" => "Czyść Mapowanie nazwy grupy LDAP",
diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php
index 9469146d359db8cc00cb4ca153334c9a5d53dba9..0ff145f0a9c2a9f1ac8f8ce6c6339e7b941909d8 100644
--- a/apps/user_ldap/l10n/pt_BR.php
+++ b/apps/user_ldap/l10n/pt_BR.php
@@ -76,7 +76,8 @@ $TRANSLATIONS = array(
 "Internal Username Attribute:" => "Atributo Interno de Nome de Usuário:",
 "Override UUID detection" => "Substituir detecção UUID",
 "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por padrão, o atributo UUID é detectado automaticamente. O atributo UUID é usado para identificar, sem dúvidas, os usuários e grupos LDAP. Além disso, o nome de usuário interno será criado com base no UUID, se não especificado acima. Você pode substituir a configuração e passar um atributo de sua escolha. Você deve certificar-se de que o atributo de sua escolha pode ser lido tanto para usuários como para grupos, e que seja único. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas para usuários e grupos LDAP recém mapeados (adicionados).",
-"UUID Attribute:" => "Atributo UUID:",
+"UUID Attribute for Users:" => "UUID Atributos para Usuários:",
+"UUID Attribute for Groups:" => "UUID Atributos para Grupos:",
 "Username-LDAP User Mapping" => "Usuário-LDAP Mapeamento de Usuário",
 "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Nomes de usuários sãi usados para armazenar e atribuir (meta) dados. A fim de identificar com precisão e reconhecer usuários, cada usuário LDAP terá um nome de usuário interno. Isso requer um mapeamento nome de usuário para usuário LDAP. O nome de usuário criado é mapeado para o UUID do usuário LDAP. Adicionalmente, o DN fica em cache, assim como para reduzir a interação LDAP, mas não é utilizado para a identificação. Se o DN muda, as mudanças serão encontradas. O nome de usuário interno é utilizado em todo lugar. Limpar os mapeamentos não influencia a configuração. Limpar os mapeamentos deixará rastros em todo lugar. Limpar os mapeamentos não influencia a configuração, mas afeta as configurações LDAP! Somente limpe os mapeamentos em embiente de testes ou em estágio experimental.",
 "Clear Username-LDAP User Mapping" => "Limpar Mapeamento de Usuário Nome de Usuário-LDAP",
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index b88ad18f0f6c12ed7b316993fd580304eca97c71..338d68d1dfdb542216dbf262c320aec4a58bc950 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -66,7 +66,6 @@ $TRANSLATIONS = array(
 "Internal Username" => "Nome de utilizador interno",
 "Internal Username Attribute:" => "Atributo do nome de utilizador interno",
 "Override UUID detection" => "Passar a detecção do UUID",
-"UUID Attribute:" => "Atributo UUID:",
 "Username-LDAP User Mapping" => "Mapeamento do utilizador LDAP",
 "Clear Username-LDAP User Mapping" => "Limpar mapeamento do utilizador-LDAP",
 "Clear Groupname-LDAP Group Mapping" => "Limpar o mapeamento do nome de grupo LDAP",
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index f1cf51dc51bffe35c0d84b60722b07927214375b..a76afa1fe1949510fe0df03ee41fbbbb4367ca4c 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -76,7 +76,6 @@ $TRANSLATIONS = array(
 "Internal Username Attribute:" => "Аттрибут для внутреннего имени:",
 "Override UUID detection" => "Переопределить нахождение UUID",
 "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "По-умолчанию, ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно индентифицировать пользователей и группы LDAP. Также, на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по-умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP.",
-"UUID Attribute:" => "Аттрибут для UUID:",
 "Username-LDAP User Mapping" => "Соответствия Имя-Пользователь LDAP",
 "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "ownCloud использует имена пользователей для хранения и назначения метаданных. Для точной идентификации и распознавания пользователей, каждый пользователь LDAP будет иметь свое внутреннее имя пользователя. Это требует привязки имени пользователя ownCloud к пользователю LDAP. При создании имя пользователя назначается идентификатору UUID пользователя LDAP. Помимо этого кешируется доменное имя (DN) для уменьшения числа обращений к LDAP, однако оно не используется для идентификации. Если доменное имя было изменено, об этом станет известно ownCloud. Внутреннее имя ownCloud используется повсеместно в ownCloud. После сброса привязок в базе могут сохраниться остатки старой информации. Сброс привязок не привязан к конфигурации, он повлияет на все LDAP подключения! Ни в коем случае не рекомендуется сбрасывать привязки если система уже находится в эксплуатации, только на этапе тестирования.",
 "Clear Username-LDAP User Mapping" => "Очистить соответствия Имя-Пользователь LDAP",
diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index df71a71e933b5463b3b6ec70c4a162a7582b77bc..08b32e75f932725159f238d3632afb6d9ef3ddee 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -76,7 +76,6 @@ $TRANSLATIONS = array(
 "Internal Username Attribute:" => "Atribút interného používateľského mena:",
 "Override UUID detection" => "Prepísať UUID detekciu",
 "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "V predvolenom nastavení je UUID atribút detekovaný automaticky. UUID atribút je použitý na jedinečnú identifikáciu používateľov a skupín z LDAP. Naviac je na základe UUID vytvorené tiež interné použivateľské meno, ak nie je nastavené inak. Môžete predvolené nastavenie prepísať a použiť atribút ktorý si sami zvolíte. Musíte sa ale ubezpečiť, že atribút ktorý vyberiete bude uvedený pri použivateľoch, aj pri skupinách a je jedinečný. Ponechajte prázdne pre predvolené správanie. Zmena bude mať vplyv len na novo namapovaných (pridaných) používateľov a skupiny z LDAP.",
-"UUID Attribute:" => "UUID atribút:",
 "Username-LDAP User Mapping" => "Mapovanie názvov LDAP používateľských mien",
 "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Použivateľské mená sa používajú pre uchovávanie a priraďovanie (meta)dát. Pre správnu identifikáciu a rozpoznanie používateľov bude mať každý používateľ z LDAP interné používateľské meno. To je nevyhnutné pre namapovanie používateľských mien na používateľov v LDAP. Vytvorené používateľské meno je namapované na UUID používateľa v LDAP. Naviac je cachovaná DN pre obmedzenie interakcie s LDAP, ale nie je používaná pre identifikáciu. Ak sa DN zmení, bude to správne rozpoznané. Interné používateľské meno sa používa všade. Vyčistenie namapování vymaže zvyšky všade. Vyčistenie naviac nie je špecifické, bude mať vplyv na všetky LDAP konfigurácie! Nikdy nečistite namapovanie v produkčnom prostredí, len v testovacej alebo experimentálnej fáze.",
 "Clear Username-LDAP User Mapping" => "Zrušiť mapovanie LDAP používateľských mien",
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index 703b643db588f7260a3d66a1164f78ab36df99fe..de81b2c8de0b3f49734a4b5c8640f31056ba2786 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -66,7 +66,6 @@ $TRANSLATIONS = array(
 "Internal Username" => "Interno uporabniško ime",
 "Internal Username Attribute:" => "Atribut Interno uporabniško ime",
 "Override UUID detection" => "Prezri zaznavo UUID",
-"UUID Attribute:" => "Atribut UUID",
 "Username-LDAP User Mapping" => "Preslikava uporabniško ime - LDAP-uporabnik",
 "Clear Username-LDAP User Mapping" => "Izbriši preslikavo Uporabniškega imena in LDAP-uporabnika",
 "Clear Groupname-LDAP Group Mapping" => "Izbriši preslikavo Skupine in LDAP-skupine",
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index 3288438c09b94a44617d0b14ece333e530510984..a5c060c717d85dc5bb37987c1fad4afc4da3fadf 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -76,7 +76,6 @@ $TRANSLATIONS = array(
 "Internal Username Attribute:" => "Internt Användarnamn Attribut:",
 "Override UUID detection" => "Åsidosätt UUID detektion",
 "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Som standard upptäcker ownCloud automatiskt UUID-attributet. Det UUID-attributet används för att utan tvivel identifiera LDAP-användare och grupper. Dessutom kommer interna användarnamn skapas baserat på detta UUID, om inte annat anges ovan. Du kan åsidosätta inställningen och passera ett attribut som du själv väljer. Du måste se till att attributet som du väljer kan hämtas för både användare och grupper och att det är unikt. Lämna det tomt för standard beteende. Förändringar kommer endast att påverka nyligen mappade (tillagda) LDAP-användare och grupper.",
-"UUID Attribute:" => "UUID Attribut:",
 "Username-LDAP User Mapping" => "Användarnamn-LDAP User Mapping",
 "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "ownCloud använder sig av användarnamn för att lagra och tilldela (meta) data. För att exakt kunna identifiera och känna igen användare, kommer varje LDAP-användare ha ett internt användarnamn. Detta kräver en mappning från ownCloud-användarnamn till LDAP-användare. Det skapade användarnamnet mappas till UUID för LDAP-användaren. Dessutom cachas DN  samt minska LDAP-interaktionen, men den används inte för identifiering. Om DN förändras, kommer förändringarna hittas av ownCloud. Det interna ownCloud-namnet används överallt i ownCloud. Om du rensar/raderar mappningarna kommer att lämna referenser överallt i systemet. Men den är inte konfigurationskänslig, den påverkar alla LDAP-konfigurationer! Rensa/radera aldrig mappningarna i en produktionsmiljö. Utan gör detta endast på i testmiljö!",
 "Clear Username-LDAP User Mapping" => "Rensa Användarnamn-LDAP User Mapping",
diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php
index c30cb421505225cd6c713203df5af6de6af4df3b..e59b91a0e905e003c0fb05ad9ca17089b2f8694f 100644
--- a/apps/user_ldap/l10n/zh_CN.php
+++ b/apps/user_ldap/l10n/zh_CN.php
@@ -66,7 +66,6 @@ $TRANSLATIONS = array(
 "Internal Username" => "内部用户名",
 "Internal Username Attribute:" => "内部用户名属性:",
 "Override UUID detection" => "超越UUID检测",
-"UUID Attribute:" => "UUID属性:",
 "Username-LDAP User Mapping" => "用户名-LDAP用户映射",
 "Clear Username-LDAP User Mapping" => "清除用户-LDAP用户映射",
 "Clear Groupname-LDAP Group Mapping" => "清除组用户-LDAP级映射",
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index fdf9c24612d13e11907d4a29d93477521b007c44..f75a78bcb0bae2d821d8ef7062cbcee0deea3b55 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -288,7 +288,7 @@ class Access extends LDAPUtility {
 		}
 
 		//second try: get the UUID and check if it is known. Then, update the DN and return the name.
-		$uuid = $this->getUUID($dn);
+		$uuid = $this->getUUID($dn, $isUser);
 		if($uuid) {
 			$query = \OCP\DB::prepare('
 				SELECT `owncloud_name`
@@ -580,7 +580,9 @@ class Access extends LDAPUtility {
 		');
 
 		//feed the DB
-		$insRows = $insert->execute(array($dn, $ocname, $this->getUUID($dn), $dn, $ocname));
+		$insRows = $insert->execute(array($dn, $ocname,
+										  $this->getUUID($dn, $isUser), $dn,
+										  $ocname));
 
 		if(\OCP\DB::isError($insRows)) {
 			return false;
@@ -905,55 +907,67 @@ class Access extends LDAPUtility {
 	 * @param $force the detection should be run, even if it is not set to auto
 	 * @returns true on success, false otherwise
 	 */
-	private function detectUuidAttribute($dn, $force = false) {
-		if(($this->connection->ldapUuidAttribute !== 'auto') && !$force) {
+	private function detectUuidAttribute($dn, $isUser = true, $force = false) {
+		if($isUser) {
+			$uuidAttr     = 'ldapUuidUserAttribute';
+			$uuidOverride = $this->connection->ldapExpertUUIDUserAttr;
+		} else {
+			$uuidAttr     = 'ldapUuidGroupAttribute';
+			$uuidOverride = $this->connection->ldapExpertUUIDGroupAttr;
+		}
+
+		if(($this->connection->$uuidAttr !== 'auto') && !$force) {
 			return true;
 		}
 
-		$fixedAttribute = $this->connection->ldapExpertUUIDAttr;
-		if(!empty($fixedAttribute)) {
-			$this->connection->ldapUuidAttribute = $fixedAttribute;
+		if(!empty($uuidOverride) && !$force) {
+			$this->connection->$uuidAttr = $uuidOverride;
 			return true;
 		}
 
-		//for now, supported (known) attributes are entryUUID, nsuniqueid, objectGUID
+		//for now, supported attributes are entryUUID, nsuniqueid, objectGUID
 		$testAttributes = array('entryuuid', 'nsuniqueid', 'objectguid', 'guid');
 
 		foreach($testAttributes as $attribute) {
-			\OCP\Util::writeLog('user_ldap', 'Testing '.$attribute.' as UUID attr', \OCP\Util::DEBUG);
-
 			$value = $this->readAttribute($dn, $attribute);
 			if(is_array($value) && isset($value[0]) && !empty($value[0])) {
-				\OCP\Util::writeLog('user_ldap', 'Setting '.$attribute.' as UUID attr', \OCP\Util::DEBUG);
-				$this->connection->ldapUuidAttribute = $attribute;
+				\OCP\Util::writeLog('user_ldap',
+									'Setting '.$attribute.' as '.$uuidAttr,
+									\OCP\Util::DEBUG);
+				$this->connection->$uuidAttr = $attribute;
 				return true;
 			}
-			\OCP\Util::writeLog('user_ldap',
-				'The looked for uuid attr is not '.$attribute.', result was '.print_r($value, true),
-				\OCP\Util::DEBUG);
 		}
+		\OCP\Util::writeLog('user_ldap',
+							'Could not autodetect the UUID attribute',
+							\OCP\Util::ERROR);
 
 		return false;
 	}
 
-	public function getUUID($dn) {
-		if($this->detectUuidAttribute($dn)) {
-			\OCP\Util::writeLog('user_ldap',
-				'UUID Checking \ UUID for '.$dn.' using '. $this->connection->ldapUuidAttribute,
-				\OCP\Util::DEBUG);
-			$uuid = $this->readAttribute($dn, $this->connection->ldapUuidAttribute);
-			if(!is_array($uuid) && $this->connection->ldapOverrideUuidAttribute) {
-				$this->detectUuidAttribute($dn, true);
-				$uuid = $this->readAttribute($dn, $this->connection->ldapUuidAttribute);
+	public function getUUID($dn, $isUser = true) {
+		if($isUser) {
+			$uuidAttr     = 'ldapUuidUserAttribute';
+			$uuidOverride = $this->connection->ldapExpertUUIDUserAttr;
+		} else {
+			$uuidAttr     = 'ldapUuidGroupAttribute';
+			$uuidOverride = $this->connection->ldapExpertUUIDGroupAttr;
+		}
+
+		$uuid = false;
+		if($this->detectUuidAttribute($dn, $isUser)) {
+			$uuid = $this->readAttribute($dn, $this->connection->$uuidAttr);
+			if( !is_array($uuid)
+				&& !empty($uuidOverride)
+				&& $this->detectUuidAttribute($dn, $isUser, true)) {
+					$uuid = $this->readAttribute($dn,
+												 $this->connection->$uuidAttr);
 			}
 			if(is_array($uuid) && isset($uuid[0]) && !empty($uuid[0])) {
 				$uuid = $uuid[0];
-			} else {
-				$uuid = false;
 			}
-		} else {
-			$uuid = false;
 		}
+
 		return $uuid;
 	}
 
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index a53022c27b3231b23c5aee02a92288402e490c56..93efdb4c9cbd0d729c178c551ab4ccc35a0b1283 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -60,7 +60,8 @@ class Connection extends LDAPUtility {
 		'ldapQuotaDefault' => null,
 		'ldapEmailAttribute' => null,
 		'ldapCacheTTL' => null,
-		'ldapUuidAttribute' => 'auto',
+		'ldapUuidUserAttribute' => 'auto',
+		'ldapUuidGroupAttribute' => 'auto',
 		'ldapOverrideUuidAttribute' => null,
 		'ldapOverrideMainServer' => false,
 		'ldapConfigurationActive' => false,
@@ -69,7 +70,8 @@ class Connection extends LDAPUtility {
 		'homeFolderNamingRule' => null,
 		'hasPagedResultSupport' => false,
 		'ldapExpertUsernameAttr' => null,
-		'ldapExpertUUIDAttr' => null,
+		'ldapExpertUUIDUserAttr' => null,
+		'ldapExpertUUIDGroupAttr' => null,
 	);
 
 	/**
@@ -120,11 +122,11 @@ class Connection extends LDAPUtility {
 	public function __set($name, $value) {
 		$changed = false;
 		//only few options are writable
-		if($name === 'ldapUuidAttribute') {
-			\OCP\Util::writeLog('user_ldap', 'Set config ldapUuidAttribute to  '.$value, \OCP\Util::DEBUG);
+		if($name === 'ldapUuidUserAttribute' || $name === 'ldapUuidGroupAttribute') {
+			\OCP\Util::writeLog('user_ldap', 'Set config '.$name.' to  '.$value, \OCP\Util::DEBUG);
 			$this->config[$name] = $value;
 			if(!empty($this->configID)) {
-				\OCP\Config::setAppValue($this->configID, $this->configPrefix.'ldap_uuid_attribute', $value);
+				\OCP\Config::setAppValue($this->configID, $this->configPrefix.$name, $value);
 			}
 			$changed = true;
 		}
@@ -285,8 +287,10 @@ class Connection extends LDAPUtility {
 			$this->config['ldapIgnoreNamingRules']
 				= \OCP\Config::getSystemValue('ldapIgnoreNamingRules', false);
 			$this->config['ldapCacheTTL']    = $this->$v('ldap_cache_ttl');
-			$this->config['ldapUuidAttribute']
-				= $this->$v('ldap_uuid_attribute');
+			$this->config['ldapUuidUserAttribute']
+				= $this->$v('ldap_uuid_user_attribute');
+			$this->config['ldapUuidGroupAttribute']
+				= $this->$v('ldap_uuid_group_attribute');
 			$this->config['ldapOverrideUuidAttribute']
 				= $this->$v('ldap_override_uuid_attribute');
 			$this->config['homeFolderNamingRule']
@@ -299,8 +303,10 @@ class Connection extends LDAPUtility {
 				= preg_split('/\r\n|\r|\n/', $this->$v('ldap_attributes_for_group_search'));
 			$this->config['ldapExpertUsernameAttr']
 				= $this->$v('ldap_expert_username_attr');
-			$this->config['ldapExpertUUIDAttr']
-				= $this->$v('ldap_expert_uuid_attr');
+			$this->config['ldapExpertUUIDUserAttr']
+				= $this->$v('ldap_expert_uuid_user_attr');
+			$this->config['ldapExpertUUIDGroupAttr']
+				= $this->$v('ldap_expert_uuid_group_attr');
 
 			$this->configured = $this->validateConfiguration();
 		}
@@ -339,7 +345,8 @@ class Connection extends LDAPUtility {
 			'ldap_attributes_for_user_search' => 'ldapAttributesForUserSearch',
 			'ldap_attributes_for_group_search' => 'ldapAttributesForGroupSearch',
 			'ldap_expert_username_attr' => 'ldapExpertUsernameAttr',
-			'ldap_expert_uuid_attr' => 'ldapExpertUUIDAttr',
+			'ldap_expert_uuid_user_attr' => 'ldapExpertUUIDUserAttr',
+			'ldap_expert_uuid_group_attr' => 'ldapExpertUUIDGroupAttr',
 		);
 		return $array;
 	}
@@ -413,7 +420,8 @@ class Connection extends LDAPUtility {
 					break;
 				case 'ldapIgnoreNamingRules':
 				case 'ldapOverrideUuidAttribute':
-				case 'ldapUuidAttribute':
+				case 'ldapUuidUserAttribute':
+				case 'ldapUuidGroupAttribute':
 				case 'hasPagedResultSupport':
 					continue 2;
 			}
@@ -476,13 +484,23 @@ class Connection extends LDAPUtility {
 		}
 		$uuidAttributes = array(
 			'auto', 'entryuuid', 'nsuniqueid', 'objectguid', 'guid');
-		if(!in_array($this->config['ldapUuidAttribute'], $uuidAttributes)
-			&& (!is_null($this->configID))) {
-			\OCP\Config::setAppValue($this->configID, $this->configPrefix.'ldap_uuid_attribute', 'auto');
-			\OCP\Util::writeLog('user_ldap',
-				'Illegal value for the UUID Attribute, reset to autodetect.',
-				\OCP\Util::INFO);
+		$uuidSettings = array(
+						'ldapUuidUserAttribute' => 'ldapExpertUUIDUserAttr',
+						'ldapUuidGroupAttribute' => 'ldapExpertUUIDGroupAttr');
+		$cta = array_flip($this->getConfigTranslationArray());
+		foreach($uuidSettings as $defaultKey => $overrideKey) {
+			if( !in_array($this->config[$defaultKey], $uuidAttributes)
+				&& is_null($this->config[$overrideKey])
+				&& !is_null($this->configID)) {
+				\OCP\Config::setAppValue($this->configID,
+										$this->configPrefix.$cta[$defaultKey],
+										'auto');
+				\OCP\Util::writeLog('user_ldap',
+					'Illegal value for'.$defaultKey.', reset to autodetect.',
+					\OCP\Util::DEBUG);
+			}
 		}
+
 		if(empty($this->config['ldapBackupPort'])) {
 			//force default
 			$this->config['ldapBackupPort'] = $this->config['ldapPort'];
@@ -502,8 +520,6 @@ class Connection extends LDAPUtility {
 				\OCP\Util::INFO);
 		}
 
-
-
 		//second step: critical checks. If left empty or filled wrong, set as unconfigured and give a warning.
 		$configurationOK = true;
 		if(empty($this->config['ldapHost'])) {
@@ -552,8 +568,11 @@ class Connection extends LDAPUtility {
 			$configurationOK = false;
 		}
 
-		if(!empty($this->config['ldapExpertUUIDAttr'])) {
-			$this->config['ldapUuidAttribute'] = $this->config['ldapExpertUUIDAttr'];
+		if(!empty($this->config['ldapExpertUUIDUserAttr'])) {
+			$this->config['ldapUuidUserAttribute'] = $this->config['ldapExpertUUIDUserAttr'];
+		}
+		if(!empty($this->config['ldapExpertUUIDGroupAttr'])) {
+			$this->config['ldapUuidGroupAttribute'] = $this->config['ldapExpertUUIDGroupAttr'];
 		}
 
 		return $configurationOK;
@@ -587,15 +606,17 @@ class Connection extends LDAPUtility {
 			'ldap_email_attr'                   => '',
 			'ldap_group_member_assoc_attribute' => 'uniqueMember',
 			'ldap_cache_ttl'                    => 600,
-			'ldap_uuid_attribute'				=> 'auto',
+			'ldap_uuid_user_attribute'          => 'auto',
+			'ldap_uuid_group_attribute'         => 'auto',
 			'ldap_override_uuid_attribute'		=> 0,
 			'home_folder_naming_rule'           => '',
 			'ldap_turn_off_cert_check'			=> 0,
 			'ldap_configuration_active'			=> 1,
 			'ldap_attributes_for_user_search'	=> '',
 			'ldap_attributes_for_group_search'	=> '',
-			'ldap_expert_username_attr'              => '',
-			'ldap_expert_uuid_attr'             => '',
+			'ldap_expert_username_attr'         => '',
+			'ldap_expert_uuid_user_attr'        => '',
+			'ldap_expert_uuid_group_attr'       => '',
 		);
 	}
 
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index b7070f23183b00b2c5cd73fe6d62b21ae7f2652f..f20bc1911836999dd6bcadd00bc01a2780800ddd 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -25,18 +25,6 @@
 
 OC_Util::checkAdminUser();
 
-$params = array('ldap_host', 'ldap_port', 'ldap_backup_host',
-				'ldap_backup_port', 'ldap_override_main_server', 'ldap_dn',
-				'ldap_agent_password', 'ldap_base', 'ldap_base_users',
-				'ldap_base_groups', 'ldap_userlist_filter',
-				'ldap_login_filter', 'ldap_group_filter', 'ldap_display_name',
-				'ldap_group_display_name', 'ldap_tls',
-				'ldap_turn_off_cert_check', 'ldap_nocase', 'ldap_quota_def',
-				'ldap_quota_attr', 'ldap_email_attr',
-				'ldap_group_member_assoc_attribute', 'ldap_cache_ttl',
-				'home_folder_naming_rule'
-				);
-
 OCP\Util::addscript('user_ldap', 'settings');
 OCP\Util::addstyle('user_ldap', 'settings');
 
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index e214d57fb1d91a91a637bb34c90c9d330d5c0917..319dc38a62d937decbd86b0a96be2bd2cf8ad7ef 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -100,7 +100,8 @@
 		<p class="ldapIndent"><label for="ldap_expert_username_attr"><?php p($l->t('Internal Username Attribute:'));?></label><input type="text" id="ldap_expert_username_attr" name="ldap_expert_username_attr" data-default="<?php p($_['ldap_expert_username_attr_default']); ?>" /></p>
 		<p><strong><?php p($l->t('Override UUID detection'));?></strong></p>
 		<p class="ldapIndent"><?php p($l->t('By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups.'));?></p>
-		<p class="ldapIndent"><label for="ldap_expert_uuid_attr"><?php p($l->t('UUID Attribute:'));?></label><input type="text" id="ldap_expert_uuid_attr" name="ldap_expert_uuid_attr" data-default="<?php p($_['ldap_expert_uuid_attr_default']); ?>" /></p>
+		<p class="ldapIndent"><label for="ldap_expert_uuid_user_attr"><?php p($l->t('UUID Attribute for Users:'));?></label><input type="text" id="ldap_expert_uuid_user_attr" name="ldap_expert_uuid_user_attr" data-default="<?php p($_['ldap_expert_uuid_user_attr_default']); ?>" /></p>
+		<p class="ldapIndent"><label for="ldap_expert_uuid_group_attr"><?php p($l->t('UUID Attribute for Groups:'));?></label><input type="text" id="ldap_expert_uuid_group_attr" name="ldap_expert_uuid_group_attr" data-default="<?php p($_['ldap_expert_uuid_group_attr_default']); ?>" /></p>
 		<p><strong><?php p($l->t('Username-LDAP User Mapping'));?></strong></p>
 		<p class="ldapIndent"><?php p($l->t('Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage.'));?></p>
 		<p class="ldapIndent"><button id="ldap_action_clear_user_mappings" name="ldap_action_clear_user_mappings"><?php p($l->t('Clear Username-LDAP User Mapping'));?></button><br/><button id="ldap_action_clear_group_mappings" name="ldap_action_clear_group_mappings"><?php p($l->t('Clear Groupname-LDAP Group Mapping'));?></button></p>
diff --git a/apps/user_webdavauth/l10n/mk.php b/apps/user_webdavauth/l10n/mk.php
index 245a5101341d2a51e59b2cc0575b907f85eb3945..6ebe36423b243817d82f8e376c24bc362af5255b 100644
--- a/apps/user_webdavauth/l10n/mk.php
+++ b/apps/user_webdavauth/l10n/mk.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
-"URL: http://" => "URL: http://"
+<?php
+$TRANSLATIONS = array(
+"Address: " => "Адреса:"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/config/config.sample.php b/config/config.sample.php
index 29085af4716240f866ad22087180fc86cab2edda..9a24c9364e016702a95e8315d19d0f67139edb5f 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -141,10 +141,16 @@ $CONFIG = array(
 /* date format to be used while writing to the owncloud logfile */
 'logdateformat' => 'F d, Y H:i:s',
 
+/* timezone used while writing to the owncloud logfile (default: UTC) */
+'logtimezone' => 'Europe/Berlin',
+
 /* Append all database queries and parameters to the log file.
  (watch out, this option can increase the size of your log file)*/
 "log_query" => false,
 
+/* Enable or disable the logging of IP addresses in case of webform auth failures */
+"log_authfailip" => false,
+
 /*
  * Configure the size in bytes log rotation should happen, 0 or false disables the rotation.
  * This rotates the current owncloud logfile to a new name, this way the total log usage
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 1166ea3198a2d4688151516cbe56c50f4c481219..dbad8f2e971e12a8a4223dcfd9a01de3cf43ebe7 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -293,7 +293,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 				while ($count < 15 && count($users) == $limit) {
 					$limit = 15 - $count;
 					if ($sharePolicy == 'groups_only') {
-						$users = OC_Group::DisplayNamesInGroups($groups, $_GET['search'], $limit, $offset);
+						$users = OC_Group::DisplayNamesInGroups($usergroups, $_GET['search'], $limit, $offset);
 					} else {
 						$users = OC_User::getDisplayNames($_GET['search'], $limit, $offset);
 					}
diff --git a/core/ajax/vcategories/add.php b/core/ajax/vcategories/add.php
deleted file mode 100644
index 16a1461be08b23c57fd00fc4ec9e15d8aa7b5acb..0000000000000000000000000000000000000000
--- a/core/ajax/vcategories/add.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-function bailOut($msg) {
-	OC_JSON::error(array('data' => array('message' => $msg)));
-	OC_Log::write('core', 'ajax/vcategories/add.php: '.$msg, OC_Log::DEBUG);
-	exit();
-}
-function debug($msg) {
-	OC_Log::write('core', 'ajax/vcategories/add.php: '.$msg, OC_Log::DEBUG);
-}
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$l = OC_L10N::get('core');
-
-$category = isset($_POST['category']) ? strip_tags($_POST['category']) : null;
-$type = isset($_POST['type']) ? $_POST['type'] : null;
-
-if(is_null($type)) {
-	bailOut($l->t('Category type not provided.'));
-}
-
-if(is_null($category)) {
-	bailOut($l->t('No category to add?'));
-}
-
-debug(print_r($category, true));
-
-$categories = new OC_VCategories($type);
-if($categories->hasCategory($category)) {
-	bailOut($l->t('This category already exists: %s', array($category)));
-} else {
-	$categories->add($category, true);
-}
-
-OC_JSON::success(array('data' => array('categories'=>$categories->categories())));
diff --git a/core/ajax/vcategories/addToFavorites.php b/core/ajax/vcategories/addToFavorites.php
deleted file mode 100644
index 52f62d5fc6b0ce0e05846ece12bd9c589921c7b8..0000000000000000000000000000000000000000
--- a/core/ajax/vcategories/addToFavorites.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-function bailOut($msg) {
-	OC_JSON::error(array('data' => array('message' => $msg)));
-	OC_Log::write('core', 'ajax/vcategories/addToFavorites.php: '.$msg, OC_Log::DEBUG);
-	exit();
-}
-function debug($msg) {
-	OC_Log::write('core', 'ajax/vcategories/addToFavorites.php: '.$msg, OC_Log::DEBUG);
-}
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$l = OC_L10N::get('core');
-
-$id = isset($_POST['id']) ? strip_tags($_POST['id']) : null;
-$type = isset($_POST['type']) ? $_POST['type'] : null;
-
-if(is_null($type)) {
-	bailOut($l->t('Object type not provided.'));
-}
-
-if(is_null($id)) {
-	bailOut($l->t('%s ID not provided.', $type));
-}
-
-$categories = new OC_VCategories($type);
-if(!$categories->addToFavorites($id, $type)) {
-	bailOut($l->t('Error adding %s to favorites.', $id));
-}
-
-OC_JSON::success();
diff --git a/core/ajax/vcategories/delete.php b/core/ajax/vcategories/delete.php
deleted file mode 100644
index dfec378574313f71ffc073d8ae34ac941c637afb..0000000000000000000000000000000000000000
--- a/core/ajax/vcategories/delete.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-function bailOut($msg) {
-	OC_JSON::error(array('data' => array('message' => $msg)));
-	OC_Log::write('core', 'ajax/vcategories/delete.php: '.$msg, OC_Log::DEBUG);
-	exit();
-}
-function debug($msg) {
-	OC_Log::write('core', 'ajax/vcategories/delete.php: '.$msg, OC_Log::DEBUG);
-}
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$l = OC_L10N::get('core');
-
-$type = isset($_POST['type']) ? $_POST['type'] : null;
-$categories = isset($_POST['categories']) ? $_POST['categories'] : null;
-
-if(is_null($type)) {
-	bailOut($l->t('Object type not provided.'));
-}
-
-debug('The application using category type "'
-	. $type
-	. '" uses the default file for deletion. OC_VObjects will not be updated.');
-
-if(is_null($categories)) {
-	bailOut($l->t('No categories selected for deletion.'));
-}
-
-$vcategories = new OC_VCategories($type);
-$vcategories->delete($categories);
-OC_JSON::success(array('data' => array('categories'=>$vcategories->categories())));
diff --git a/core/ajax/vcategories/edit.php b/core/ajax/vcategories/edit.php
deleted file mode 100644
index 0387b17576c4353a92c0a842e9d3040b80c09a7c..0000000000000000000000000000000000000000
--- a/core/ajax/vcategories/edit.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-function bailOut($msg) {
-	OC_JSON::error(array('data' => array('message' => $msg)));
-	OC_Log::write('core', 'ajax/vcategories/edit.php: '.$msg, OC_Log::DEBUG);
-	exit();
-}
-function debug($msg) {
-	OC_Log::write('core', 'ajax/vcategories/edit.php: '.$msg, OC_Log::DEBUG);
-}
-
-OC_JSON::checkLoggedIn();
-
-$l = OC_L10N::get('core');
-
-$type = isset($_GET['type']) ? $_GET['type'] : null;
-
-if(is_null($type)) {
-	bailOut($l->t('Category type not provided.'));
-}
-
-$tmpl = new OCP\Template("core", "edit_categories_dialog");
-
-$vcategories = new OC_VCategories($type);
-$categories = $vcategories->categories();
-debug(print_r($categories, true));
-$tmpl->assign('categories', $categories);
-$tmpl->printpage();
diff --git a/core/ajax/vcategories/favorites.php b/core/ajax/vcategories/favorites.php
deleted file mode 100644
index db4244d601adb4443d1bb84081166882b564a03a..0000000000000000000000000000000000000000
--- a/core/ajax/vcategories/favorites.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-function bailOut($msg) {
-	OC_JSON::error(array('data' => array('message' => $msg)));
-	OC_Log::write('core', 'ajax/vcategories/addToFavorites.php: '.$msg, OC_Log::DEBUG);
-	exit();
-}
-function debug($msg) {
-	OC_Log::write('core', 'ajax/vcategories/addToFavorites.php: '.$msg, OC_Log::DEBUG);
-}
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$type = isset($_GET['type']) ? $_GET['type'] : null;
-
-if(is_null($type)) {
-	$l = OC_L10N::get('core');
-	bailOut($l->t('Object type not provided.'));
-}
-
-$categories = new OC_VCategories($type);
-$ids = $categories->getFavorites($type);
-
-OC_JSON::success(array('ids' => $ids));
diff --git a/core/ajax/vcategories/removeFromFavorites.php b/core/ajax/vcategories/removeFromFavorites.php
deleted file mode 100644
index 78a528caa861b1ed474c3196512778e66d9e1f07..0000000000000000000000000000000000000000
--- a/core/ajax/vcategories/removeFromFavorites.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-function bailOut($msg) {
-	OC_JSON::error(array('data' => array('message' => $msg)));
-	OC_Log::write('core', 'ajax/vcategories/removeFromFavorites.php: '.$msg, OC_Log::DEBUG);
-	exit();
-}
-function debug($msg) {
-	OC_Log::write('core', 'ajax/vcategories/removeFromFavorites.php: '.$msg, OC_Log::DEBUG);
-}
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$l = OC_L10N::get('core');
-
-$id = isset($_POST['id']) ? strip_tags($_POST['id']) : null;
-$type = isset($_POST['type']) ? $_POST['type'] : null;
-
-if(is_null($type)) {
-	bailOut($l->t('Object type not provided.'));
-}
-
-if(is_null($id)) {
-	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.', array($id)));
-}
-
-OC_JSON::success();
diff --git a/core/css/apps.css b/core/css/apps.css
index 49fb189f384ea0b196df14f98ba2cd7ef2ad953f..f68f53d6999ff7676d3c92e1306b450c35c3dabf 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -104,8 +104,8 @@
 	padding-left: 32px;
 }
 #app-navigation > .with-icon ul li > a {
-	padding-left: 48px;
-	background-position: 24px center;
+	padding-left: 68px;
+	background-position: 44px center;
 }
 
 #app-navigation .open {
diff --git a/core/css/jquery.ocdialog.css b/core/css/jquery.ocdialog.css
index aa72eaf8474ea409b064b2a8d0a6d8bd57e9858b..236968e3245b68e3ad7ba9138ec18c51aeac5be4 100644
--- a/core/css/jquery.ocdialog.css
+++ b/core/css/jquery.ocdialog.css
@@ -29,6 +29,7 @@
 	bottom: 0;
 	display: block;
 	margin-top: 10px;
+	width: 100%;
 }
 
 .oc-dialog-close {
diff --git a/core/css/styles.css b/core/css/styles.css
index 6406bcd7e636d0ab3d6d20b7e493f9466ddd07d7..b919660779e08251800b6c41721639821b2086ff 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -237,6 +237,7 @@ input[type="submit"].enabled {
 #body-login p.info,
 #body-login form fieldset legend,
 #body-login #datadirContent label,
+#body-login form fieldset .warning-info,
 #body-login form input[type="checkbox"]+label {
 	text-align: center;
 	color: #ccc;
@@ -253,6 +254,8 @@ input[type="submit"].enabled {
 }
 #body-login p.info a {
 	font-weight: bold;
+	padding: 13px;
+	margin: -13px;
 }
 #body-login #submit.login { margin-right:7px; } /* quick fix for log in button not being aligned with input fields, should be properly fixed by input field width later */
 
@@ -431,7 +434,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 	padding: 10px;
 	color: #d2322d;
 	background-color: rgba(0,0,0,.3);
-	text-align: center;
+	text-align: left;
 	border-radius: 3px;
 	cursor: default;
 }
@@ -466,7 +469,6 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 }
 #body-login .warning {
 	margin: 0 7px 5px;
-	font-weight: bold;
 }
 #body-login .warning legend {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
@@ -746,20 +748,27 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
 span.ui-icon {float: left; margin: 3px 7px 30px 0;}
 
 .loading { background: url('../img/loading.gif') no-repeat center; cursor: wait; }
+.loading-small { background: url('../img/loading-small.gif') no-repeat center; cursor: wait; }
 .move2trash { /* decrease spinner size */
 	width: 16px;
 	height: 16px;
 }
 
-
-/* ---- CATEGORIES ---- */
-#categoryform .scrollarea { position:absolute; left:10px; top:10px; right:10px; bottom:50px; overflow:auto; border:1px solid #ddd; background:#f8f8f8; }
-#categoryform .bottombuttons { position:absolute; bottom:10px;}
-#categoryform .bottombuttons * { float:left;}
-/*#categorylist { border:1px solid #ddd;}*/
-#categorylist li { background:#f8f8f8; padding:.3em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; }
-#categorylist li:hover, #categorylist li:active { background:#eee; }
-#category_addinput { width:10em; }
+/* ---- TAGS ---- */
+#tagsdialog .content {
+	width: 100%; height: 280px;
+}
+#tagsdialog .scrollarea {
+	overflow:auto; border:1px solid #ddd;
+	width: 100%; height: 240px;
+}
+#tagsdialog .bottombuttons {
+	 width: 100%; height: 30px;
+}
+#tagsdialog .bottombuttons * { float:left;}
+#tagsdialog .taglist li { background:#f8f8f8; padding:.3em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; }
+#tagsdialog .taglist li:hover, #tagsdialog .taglist li:active { background:#eee; }
+#tagsdialog .addinput { width: 90%; clear: both; }
 
 /* ---- APP SETTINGS ---- */
 .popup { background-color:white; border-radius:10px 10px 10px 10px; box-shadow:0 0 20px #888; color:#333; padding:10px; position:fixed !important; z-index:100; }
diff --git a/core/img/actions/confirm.png b/core/img/actions/confirm.png
new file mode 100644
index 0000000000000000000000000000000000000000..3021d4c27d6db047a0355b801a376d8f06b3e734
Binary files /dev/null and b/core/img/actions/confirm.png differ
diff --git a/core/img/actions/confirm.svg b/core/img/actions/confirm.svg
new file mode 100644
index 0000000000000000000000000000000000000000..6b69c1d6c4f361270bffd8fce9ab6b69a6433b49
--- /dev/null
+++ b/core/img/actions/confirm.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+  <path d="m1 1047.4v-6h7v-4l7 7-7 7v-4z"/>
+ </g>
+</svg>
diff --git a/core/img/loading-small.gif b/core/img/loading-small.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5025f0bedebc9a7ae8bcfa10d4541e9fb1fe49ba
Binary files /dev/null and b/core/img/loading-small.gif differ
diff --git a/core/js/oc-vcategories.js b/core/js/oc-vcategories.js
deleted file mode 100644
index c297a24680d8d8384d40718707daabd8c727043a..0000000000000000000000000000000000000000
--- a/core/js/oc-vcategories.js
+++ /dev/null
@@ -1,216 +0,0 @@
-var OCCategories= {
-	category_favorites:'_$!<Favorite>!$_',
-	edit:function(type, cb) {
-		if(!type && !this.type) {
-			throw { name: 'MissingParameter', message: t('core', 'The object type is not specified.') };
-		}
-		type = type ? type : this.type;
-		$('body').append('<div id="category_dialog"></div>');
-		$('#category_dialog').load(
-			OC.filePath('core', 'ajax', 'vcategories/edit.php') + '?type=' + type, function(response) {
-			try {
-				var jsondata = jQuery.parseJSON(response);
-				if(response.status == 'error') {
-					OC.dialogs.alert(response.data.message, t('core', 'Error'));
-					return;
-				}
-			} catch(e) {
-				var setEnabled = function(d, enable) {
-					if(enable) {
-						d.css('cursor', 'default').find('input,button:not(#category_addbutton)')
-							.prop('disabled', false).css('cursor', 'default');
-					} else {
-						d.css('cursor', 'wait').find('input,button:not(#category_addbutton)')
-							.prop('disabled', true).css('cursor', 'wait');
-					}
-				};
-				var dlg = $('#edit_categories_dialog').dialog({
-						modal: true,
-						height: 350, minHeight:200, width: 250, minWidth: 200,
-						buttons: {
-							'Close': function() {
-								$(this).dialog('close');
-							},
-							'Delete':function() {
-								var categories = $('#categorylist').find('input:checkbox').serialize();
-								setEnabled(dlg, false);
-								OCCategories.doDelete(categories, function() {
-									setEnabled(dlg, true);
-								});
-							},
-							'Rescan':function() {
-								setEnabled(dlg, false);
-								OCCategories.rescan(function() {
-									setEnabled(dlg, true);
-								});
-							}
-						},
-						close : function(event, ui) {
-							$(this).dialog('destroy').remove();
-							$('#category_dialog').remove();
-						},
-						open : function(event, ui) {
-							$('#category_addinput').on('input',function() {
-								if($(this).val().length > 0) {
-									$('#category_addbutton').removeAttr('disabled');
-								}
-							});
-							$('#categoryform').submit(function() {
-								OCCategories.add($('#category_addinput').val());
-								$('#category_addinput').val('');
-								$('#category_addbutton').attr('disabled', 'disabled');
-								return false;
-							});
-							$('#category_addbutton').on('click',function(e) {
-								e.preventDefault();
-								if($('#category_addinput').val().length > 0) {
-									OCCategories.add($('#category_addinput').val());
-									$('#category_addinput').val('');
-								}
-							});
-						}
-				});
-			}
-		});
-	},
-	_processDeleteResult:function(jsondata) {
-		if(jsondata.status == 'success') {
-			OCCategories._update(jsondata.data.categories);
-		} else {
-			OC.dialogs.alert(jsondata.data.message, t('core', 'Error'));
-		}
-	},
-	favorites:function(type, cb) {
-		if(!type && !this.type) {
-			throw { name: 'MissingParameter', message: t('core', 'The object type is not specified.') };
-		}
-		type = type ? type : this.type;
-		$.getJSON(OC.filePath('core', 'ajax', 'categories/favorites.php'), {type: type},function(jsondata) {
-			if(typeof cb == 'function') {
-				cb(jsondata);
-			} else {
-				if(jsondata.status === 'success') {
-					OCCategories._update(jsondata.data.categories);
-				} else {
-					OC.dialogs.alert(jsondata.data.message, t('core', 'Error'));
-				}
-			}
-		});
-	},
-	addToFavorites:function(id, type, cb) {
-		if(!type && !this.type) {
-			throw { name: 'MissingParameter', message: t('core', 'The object type is not specified.') };
-		}
-		type = type ? type : this.type;
-		$.post(OC.filePath('core', 'ajax', 'vcategories/addToFavorites.php'), {id:id, type:type}, function(jsondata) {
-			if(typeof cb == 'function') {
-				cb(jsondata);
-			} else {
-				if(jsondata.status !== 'success') {
-					OC.dialogs.alert(jsondata.data.message, t('core', 'Error'));
-				}
-			}
-		});
-	},
-	removeFromFavorites:function(id, type, cb) {
-		if(!type && !this.type) {
-			throw { name: 'MissingParameter', message: t('core', 'The object type is not specified.') };
-		}
-		type = type ? type : this.type;
-		$.post(OC.filePath('core', 'ajax', 'vcategories/removeFromFavorites.php'), {id:id, type:type}, function(jsondata) {
-			if(typeof cb == 'function') {
-				cb(jsondata);
-			} else {
-				if(jsondata.status !== 'success') {
-					OC.dialogs.alert(jsondata.data.message, t('core', 'Error'));
-				}
-			}
-		});
-	},
-	doDelete:function(categories, type, cb) {
-		if(!type && !this.type) {
-			throw { name: 'MissingParameter', message: t('core', 'The object type is not specified.') };
-		}
-		type = type ? type : this.type;
-		if(categories == '' || categories == undefined) {
-			OC.dialogs.alert(t('core', 'No categories selected for deletion.'), t('core', 'Error'));
-			return false;
-		}
-		var self = this;
-		var q = categories + '&type=' + type;
-		if(this.app) {
-			q += '&app=' + this.app;
-			$.post(OC.filePath(this.app, 'ajax', 'categories/delete.php'), q, function(jsondata) {
-				if(typeof cb == 'function') {
-					cb(jsondata);
-				} else {
-					self._processDeleteResult(jsondata);
-				}
-			});
-		} else {
-			$.post(OC.filePath('core', 'ajax', 'vcategories/delete.php'), q, function(jsondata) {
-				if(typeof cb == 'function') {
-					cb(jsondata);
-				} else {
-					self._processDeleteResult(jsondata);
-				}
-			});
-		}
-	},
-	add:function(category, type, cb) {
-		if(!type && !this.type) {
-			throw { name: 'MissingParameter', message: t('core', 'The object type is not specified.') };
-		}
-		type = type ? type : this.type;
-		$.post(OC.filePath('core', 'ajax', 'vcategories/add.php'),{'category':category, 'type':type},function(jsondata) {
-			if(typeof cb == 'function') {
-				cb(jsondata);
-			} else {
-				if(jsondata.status === 'success') {
-					OCCategories._update(jsondata.data.categories);
-				} else {
-					OC.dialogs.alert(jsondata.data.message, t('core', 'Error'));
-				}
-			}
-		});
-	},
-	rescan:function(app, cb) {
-		if(!app && !this.app) {
-			throw { name: 'MissingParameter', message: t('core', 'The app name is not specified.') };
-		}
-		app = app ? app : this.app;
-		$.getJSON(OC.filePath(app, 'ajax', 'categories/rescan.php'),function(jsondata, status, xhr) {
-			if(typeof cb == 'function') {
-				cb(jsondata);
-			} else {
-				if(jsondata.status === 'success') {
-					OCCategories._update(jsondata.data.categories);
-				} else {
-					OC.dialogs.alert(jsondata.data.message, t('core', 'Error'));
-				}
-			}
-		}).error(function(xhr){
-			if (xhr.status == 404) {
-				var errormessage = t('core', 'The required file {file} is not installed!',
-					  {file: OC.filePath(app, 'ajax', 'categories/rescan.php')}, t('core', 'Error'));
-				if(typeof cb == 'function') {
-					cb({status:'error', data:{message:errormessage}});
-				} else {
-					OC.dialogs.alert(errormessage, t('core', 'Error'));
-				}
-			}
-		});
-	},
-	_update:function(categories) {
-		var categorylist = $('#categorylist');
-		categorylist.find('li').remove();
-		for(var category in categories) {
-			var item = '<li><input type="checkbox" name="categories" value="' + categories[category] + '" />' + categories[category] + '</li>';
-			$(item).appendTo(categorylist);
-		}
-		if(typeof OCCategories.changed === 'function') {
-			OCCategories.changed(categories);
-		}
-	}
-}
-
diff --git a/core/js/oc-vcategories.txt b/core/js/oc-vcategories.txt
deleted file mode 100644
index 31216f80bd308e455b588ac8c12edb3eab3f1ad7..0000000000000000000000000000000000000000
--- a/core/js/oc-vcategories.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-Using OCCategories
-
-This 'class' is meant for any apps that uses OC_VObjects with the CATEGORIES field e.g.
-Contacts and Calendar. It provides an editor UI for adding/deleting and rescanning categories
-and basic ajax functions for adding and deleting.
-To use the mass updating of OC_VObjects that /lib/vcategories.php provides, the app must implement
-its own ajax functions in /apps/$(APP)/ajax/categories/rescan.php and /apps/$(APP)/ajax/categories/delete.php
-See examples in /apps/contacts/ajax/categories and the inline docs in /lib/vcategories.php.
-
-In your app make sure you load the script and stylesheet:
-
-OC_Util::addScript('','oc-vcategories');
-OC_Util::addStyle('','oc-vcategories');
-
-Set the app specific values in your javascript file. This is what I've used for the Contacts app:
-
-	OCCategories.app = 'contacts';
-	OCCategories.changed = Contacts.UI.Card.categoriesChanged;
-
-If OCCategories.changed is set that function will be called each time the categories have been changed
-in the editor (add/delete/rescan) to allow the app to update the UI accordingly. The only argument to the function
-is an array of the updated categories e.g.:
-
-OCCategories.changed = function(categories) {
-	for(var category in categories) {
-		console.log(categories[category]);
-	}
-}
-
-To show the categories editor call:
-
-	OCCategories.edit()
-
diff --git a/core/js/setup.js b/core/js/setup.js
index 62f313fc501139a18d0676148f9edd7ac78dd9df..0863be35886fc792cf725c1d35dc4460b1b20324 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -9,8 +9,7 @@ $(document).ready(function() {
 	};
 	
 	$('#selectDbType').buttonset();
-	$('#datadirContent').hide(250);
-	$('#databaseField').hide(250);
+	
 	if($('#hasSQLite').val()){
 		$('#use_other_db').hide();
 		$('#use_oracle_db').hide();
@@ -23,12 +22,7 @@ $(document).ready(function() {
 		$('#use_oracle_db').slideUp(250);
 	});
 
-	$('#mysql').click(function() {
-		$('#use_other_db').slideDown(250);
-		$('#use_oracle_db').slideUp(250);
-	});
-
-	$('#pgsql').click(function() {
+	$('#mysql,#pgsql,#mssql').click(function() {
 		$('#use_other_db').slideDown(250);
 		$('#use_oracle_db').slideUp(250);
 	});
@@ -38,11 +32,6 @@ $(document).ready(function() {
 		$('#use_oracle_db').show(250);
 	});
 
-	$('#mssql').click(function() {
-		$('#use_other_db').slideDown(250);
-		$('#use_oracle_db').slideUp(250);
-	});
-
 	$('input[checked]').trigger('click');
 
 	$('#showAdvanced').click(function() {
@@ -74,9 +63,17 @@ $(document).ready(function() {
 		form.submit();
 		return false;
 	});
-
-	if(!dbtypes.sqlite){
-		$('#showAdvanced').click();
+	
+	// Expand latest db settings if page was reloaded on error
+	var currentDbType = $('input[type="radio"]:checked').val();
+	
+	if (currentDbType === undefined){
 		$('input[type="radio"]').first().click();
 	}
+	
+	if (currentDbType === 'sqlite' || (dbtypes.sqlite && currentDbType === undefined)){
+		$('#datadirContent').hide(250);
+		$('#databaseField').hide(250);
+	}
+	
 });
diff --git a/core/js/tags.js b/core/js/tags.js
new file mode 100644
index 0000000000000000000000000000000000000000..16dd3d4bf977dfccdb5aa9556fef0b82f8dd5621
--- /dev/null
+++ b/core/js/tags.js
@@ -0,0 +1,353 @@
+OC.Tags= {
+	edit:function(type, cb) {
+		if(!type && !this.type) {
+			throw { name: 'MissingParameter', message: t('core', 'The object type is not specified.') };
+		}
+		type = type ? type : this.type;
+		var self = this;
+		$.when(this._getTemplate()).then(function($tmpl) {
+			if(self.$dialog) {
+				self.$dialog.ocdialog('close');
+			}
+			self.$dialog = $tmpl.octemplate({
+				addText: t('core', 'Enter new')
+			});
+			$('body').append(self.$dialog);
+
+			self.$dialog.ready(function() {
+				self.$taglist = self.$dialog.find('.taglist');
+				self.$taginput = self.$dialog.find('.addinput');
+				self.$taglist.on('change', 'input:checkbox', function(event) {
+					self._handleChanges(self.$taglist, self.$taginput);
+				});
+				self.$taginput.on('input', function(event) {
+					self._handleChanges(self.$taglist, self.$taginput);
+				});
+				self.deleteButton = {
+					text: t('core', 'Delete'),
+					click: function() {self._deleteTags(self, type, self._selectedIds())},
+				};
+				self.addButton = {
+					text: t('core', 'Add'),
+					click: function() {self._addTag(self, type, self.$taginput.val())},
+				};
+
+				self._fillTagList(type, self.$taglist);
+			});
+
+			self.$dialog.ocdialog({
+				title: t('core', 'Edit tags'),
+				closeOnEscape: true,
+				width: 250,
+				height: 'auto',
+				modal: true,
+				//buttons: buttonlist,
+				close: function(event, ui) {
+					try {
+						$(this).ocdialog('destroy').remove();
+					} catch(e) {console.warn(e);}
+					self.$dialog = null;
+				}
+			});
+		})
+		.fail(function(status, error) {
+			// If the method is called while navigating away
+			// from the page, it is probably not needed ;)
+			if(status !== 0) {
+				alert(t('core', 'Error loading dialog template: {error}', {error: error}));
+			}
+		});
+	},
+	/**
+	 * @param string type
+	 * @return jQuery.Promise which resolves with an array of ids
+	 */
+	getIdsForTag:function(type, tag) {
+		if(!type && !this.type) {
+			throw new Error('The object type is not specified.');
+		}
+		type = type ? type : this.type;
+		var defer = $.Deferred(),
+			self = this,
+			url = OC.Router.generate('core_tags_ids_for_tag', {type: type});
+		$.getJSON(url, {tag: tag}, function(response) {
+			if(response.status === 'success') {
+				defer.resolve(response.ids);
+			} else {
+				defer.reject(response);
+			}
+		});
+		return defer.promise();
+	},
+	/**
+	 * @param string type
+	 * @return jQuery.Promise which resolves with an array of ids
+	 */
+	getFavorites:function(type) {
+		if(!type && !this.type) {
+			throw new Error('The object type is not specified.');
+		}
+		type = type ? type : this.type;
+		var defer = $.Deferred(),
+			self = this,
+			url = OC.Router.generate('core_tags_favorites', {type: type});
+		$.getJSON(url, function(response) {
+			if(response.status === 'success') {
+				defer.resolve(response.ids);
+			} else {
+				defer.reject(response);
+			}
+		});
+		return defer.promise();
+	},
+	/**
+	 * @param string type
+	 * @return jQuery.Promise which resolves with an array of id/name objects
+	 */
+	getTags:function(type) {
+		if(!type && !this.type) {
+			throw new Error('The object type is not specified.');
+		}
+		type = type ? type : this.type;
+		var defer = $.Deferred(),
+			self = this,
+			url = OC.Router.generate('core_tags_tags', {type: type});
+		$.getJSON(url, function(response) {
+			if(response.status === 'success') {
+				defer.resolve(response.tags);
+			} else {
+				defer.reject(response);
+			}
+		});
+		return defer.promise();
+	},
+	/**
+	 * @param int id
+	 * @param string type
+	 * @return jQuery.Promise
+	 */
+	tagAs:function(id, tag, type) {
+		if(!type && !this.type) {
+			throw new Error('The object type is not specified.');
+		}
+		type = type ? type : this.type;
+		var defer = $.Deferred(),
+			self = this,
+			url = OC.Router.generate('core_tags_tag', {type: type, id: id});
+		$.post(url, {tag: tag}, function(response) {
+			if(response.status === 'success') {
+				defer.resolve(response);
+			} else {
+				defer.reject(response);
+			}
+		}).fail(function(jqXHR, textStatus, errorThrown) {
+			defer.reject(jqXHR.status, errorThrown);
+		});
+		return defer.promise();
+	},
+	/**
+	 * @param int id
+	 * @param string type
+	 * @return jQuery.Promise
+	 */
+	unTag:function(id, tag, type) {
+		if(!type && !this.type) {
+			throw new Error('The object type is not specified.');
+		}
+		type = type ? type : this.type;
+		var defer = $.Deferred(),
+			self = this,
+			url = OC.Router.generate('core_tags_untag', {type: type, id: id});
+		$.post(url, {tag: tag}, function(response) {
+			if(response.status === 'success') {
+				defer.resolve(response);
+			} else {
+				defer.reject(response);
+			}
+		}).fail(function(jqXHR, textStatus, errorThrown) {
+			defer.reject(jqXHR.status, errorThrown);
+		});
+		return defer.promise();
+	},
+	/**
+	 * @param int id
+	 * @param string type
+	 * @return jQuery.Promise
+	 */
+	addToFavorites:function(id, type) {
+		if(!type && !this.type) {
+			throw new Error('The object type is not specified.');
+		}
+		type = type ? type : this.type;
+		var defer = $.Deferred(),
+			self = this,
+			url = OC.Router.generate('core_tags_favorite', {type: type, id: id});
+		$.post(url, function(response) {
+			if(response.status === 'success') {
+				defer.resolve(response);
+			} else {
+				defer.reject(response);
+			}
+		}).fail(function(jqXHR, textStatus, errorThrown) {
+			defer.reject(jqXHR.status, errorThrown);
+		});
+		return defer.promise();
+	},
+	/**
+	 * @param int id
+	 * @param string type
+	 * @return jQuery.Promise
+	 */
+	removeFromFavorites:function(id, type) {
+		if(!type && !this.type) {
+			throw new Error('The object type is not specified.');
+		}
+		type = type ? type : this.type;
+		var defer = $.Deferred(),
+			self = this,
+			url = OC.Router.generate('core_tags_unfavorite', {type: type, id: id});
+		$.post(url, function(response) {
+			if(response.status === 'success') {
+				defer.resolve();
+			} else {
+				defer.reject(response);
+			}
+		}).fail(function(jqXHR, textStatus, errorThrown) {
+			defer.reject(jqXHR.status, errorThrown);
+		});
+		return defer.promise();
+	},
+	/**
+	 * @param string tag
+	 * @param string type
+	 * @return jQuery.Promise which resolves with an object with the name and the new id
+	 */
+	addTag:function(tag, type) {
+		if(!type && !this.type) {
+			throw new Error('The object type is not specified.');
+		}
+		type = type ? type : this.type;
+		var defer = $.Deferred(),
+			self = this,
+			url = OC.Router.generate('core_tags_add', {type: type});
+		$.post(url,{tag:tag}, function(response) {
+			if(typeof cb == 'function') {
+				cb(response);
+			}
+			if(response.status === 'success') {
+				defer.resolve({id:response.id, name: tag});
+			} else {
+				defer.reject(response);
+			}
+		}).fail(function(jqXHR, textStatus, errorThrown) {
+			defer.reject(jqXHR.status, errorThrown);
+		});
+		return defer.promise();
+	},
+	/**
+	 * @param array tags
+	 * @param string type
+	 * @return jQuery.Promise
+	 */
+	deleteTags:function(tags, type) {
+		if(!type && !this.type) {
+			throw new Error('The object type is not specified.');
+		}
+		type = type ? type : this.type;
+		var defer = $.Deferred(),
+			self = this,
+			url = OC.Router.generate('core_tags_delete', {type: type});
+		if(!tags || !tags.length) {
+			throw new Error(t('core', 'No tags selected for deletion.'));
+		}
+		var self = this;
+		$.post(url, {tags:tags}, function(response) {
+			if(response.status === 'success') {
+				defer.resolve(response.tags);
+			} else {
+				defer.reject(response);
+			}
+		}).fail(function(jqXHR, textStatus, errorThrown) {
+			defer.reject(jqXHR.status, errorThrown);
+		});
+		return defer.promise();
+	},
+	_update:function(tags, type) {
+		if(!this.$dialog) {
+			return;
+		}
+		var $taglist = this.$dialog.find('.taglist'),
+			self = this;
+		$taglist.empty();
+		$.each(tags, function(idx, tag) {
+			var $item = self.$listTmpl.octemplate({id: tag.id, name: tag.name});
+			$item.appendTo($taglist);
+		});
+		$(this).trigger('change', {type: type, tags: tags});
+		if(typeof this.changed === 'function') {
+			this.changed(tags);
+		}
+	},
+	_getTemplate: function() {
+		var defer = $.Deferred();
+		if(!this.$template) {
+			var self = this;
+			$.get(OC.filePath('core', 'templates', 'tags.html'), function(tmpl) {
+				self.$template = $(tmpl);
+				self.$listTmpl = self.$template.find('.taglist li:first-child').detach();
+				defer.resolve(self.$template);
+			})
+			.fail(function(jqXHR, textStatus, errorThrown) {
+				defer.reject(jqXHR.status, errorThrown);
+			});
+		} else {
+			defer.resolve(this.$template);
+		}
+		return defer.promise();
+	},
+	_fillTagList: function(type) {
+		var self = this;
+		$.when(this.getTags(type))
+		.then(function(tags) {
+			self._update(tags, type);
+		})
+		.fail(function(response) {
+			console.warn(response);
+		});
+	},
+	_selectedIds: function() {
+		return $.map(this.$taglist.find('input:checked'), function(b) {return $(b).val();});
+	},
+	_handleChanges: function($list, $input) {
+		var ids = this._selectedIds();
+		var buttons = [];
+		if($input.val().length) {
+			buttons.push(this.addButton);
+		}
+		if(ids.length) {
+			buttons.push(this.deleteButton);
+		}
+		this.$dialog.ocdialog('option', 'buttons', buttons);
+	},
+	_deleteTags: function(self, type, ids) {
+		$.when(self.deleteTags(ids, type))
+		.then(function() {
+			self._fillTagList(type);
+			self.$dialog.ocdialog('option', 'buttons', []);
+		})
+		.fail(function(response) {
+			console.warn(response);
+		});
+	},
+	_addTag: function(self, type, tag) {
+		$.when(self.addTag(tag, type))
+		.then(function(tag) {
+			self._fillTagList(type);
+			self.$taginput.val('').trigger('input');
+		})
+		.fail(function(response) {
+			console.warn(response);
+		});
+	}
+}
+
diff --git a/core/l10n/ady.php b/core/l10n/ady.php
new file mode 100644
index 0000000000000000000000000000000000000000..ffcdde48d47cbbe4730b36aec880f7e1642688fb
--- /dev/null
+++ b/core/l10n/ady.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index cb8a506c4a8e06543c09e0259e1f0286a0282937..212d850e6f5cc8c26239553d1b1934b293adb94f 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -1,14 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "group" => "مجموعة",
-"Category type not provided." => "نوع التصنيف لم يدخل",
-"No category to add?" => "ألا توجد فئة للإضافة؟",
-"This category already exists: %s" => "هذا التصنيف موجود مسبقا :  %s",
-"Object type not provided." => "نوع العنصر لم يدخل",
-"%s ID not provided." => "رقم  %s لم يدخل",
-"Error adding %s to favorites." => "خطأ في اضافة %s الى المفضلة",
-"No categories selected for deletion." => "لم يتم اختيار فئة للحذف",
-"Error removing %s from favorites." => "خطأ في حذف %s من المفضلة",
 "Sunday" => "الاحد",
 "Monday" => "الأثنين",
 "Tuesday" => "الثلاثاء",
@@ -46,12 +38,9 @@ $TRANSLATIONS = array(
 "Ok" => "موافق",
 "_{count} file conflict_::_{count} file conflicts_" => array("","","","","",""),
 "Cancel" => "الغاء",
-"The object type is not specified." => "نوع العنصر غير محدد.",
-"Error" => "خطأ",
-"The app name is not specified." => "اسم التطبيق غير محدد.",
-"The required file {file} is not installed!" => "الملف المطلوب {file} غير منصّب.",
 "Shared" => "مشارك",
 "Share" => "شارك",
+"Error" => "خطأ",
 "Error while sharing" => "حصل خطأ عند عملية المشاركة",
 "Error while unsharing" => "حصل خطأ عند عملية إزالة المشاركة",
 "Error while changing permissions" => "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل",
@@ -82,6 +71,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "جاري الارسال ...",
 "Email sent" => "تم ارسال البريد الالكتروني",
 "Warning" => "تحذير",
+"The object type is not specified." => "نوع العنصر غير محدد.",
+"Delete" => "إلغاء",
+"Add" => "اضف",
 "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 community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud",
 "Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
@@ -101,8 +93,6 @@ $TRANSLATIONS = array(
 "Help" => "المساعدة",
 "Access forbidden" => "التوصّل محظور",
 "Cloud not found" => "لم يتم إيجاد",
-"Edit categories" => "عدل الفئات",
-"Add" => "اضف",
 "Security Warning" => "تحذير أمان",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "لا يوجد مولّد أرقام عشوائية ، الرجاء تفعيل الـ PHP OpenSSL extension.",
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 3b7fd4633afb51bc1b58a8575b70c1c0edd8c35e..8c7a644d522242c612c4072a8d3762b15b1a9394 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"No categories selected for deletion." => "Няма избрани категории за изтриване",
 "Sunday" => "Неделя",
 "Monday" => "Понеделник",
 "Tuesday" => "Вторник",
@@ -36,12 +35,14 @@ $TRANSLATIONS = array(
 "Ok" => "Добре",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Отказ",
-"Error" => "Грешка",
 "Share" => "Споделяне",
+"Error" => "Грешка",
 "Share with" => "Споделено с",
 "Password" => "Парола",
 "create" => "създаване",
 "Warning" => "Внимание",
+"Delete" => "Изтриване",
+"Add" => "Добавяне",
 "You will receive a link to reset your password via Email." => "Ще получите връзка за нулиране на паролата Ви.",
 "Username" => "Потребител",
 "Request reset" => "Нулиране на заявка",
@@ -55,8 +56,6 @@ $TRANSLATIONS = array(
 "Help" => "Помощ",
 "Access forbidden" => "Достъпът е забранен",
 "Cloud not found" => "облакът не намерен",
-"Edit categories" => "Редактиране на категориите",
-"Add" => "Добавяне",
 "Create an <strong>admin account</strong>" => "Създаване на <strong>админ профил</strong>",
 "Advanced" => "Разширено",
 "Data folder" => "Директория за данни",
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index dfcd2f509a6a5a86c3c7eaa97841d3eba5283f3b..3e266f11063ddad5847de3914da5fb920ea50b5d 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -1,12 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Category type not provided." => "ক্যাটেগরির ধরণটি প্রদান করা হয় নি।",
-"No category to add?" => "যোগ করার মত কোন ক্যাটেগরি নেই ?",
-"Object type not provided." => "অবজেক্টের ধরণটি প্রদান করা হয় নি।",
-"%s ID not provided." => "%s ID প্রদান করা হয় নি।",
-"Error adding %s to favorites." => "প্রিয়তে %s যোগ করতে সমস্যা দেখা দিয়েছে।",
-"No categories selected for deletion." => "মুছে ফেলার জন্য কনো ক্যাটেগরি নির্বাচন করা হয় নি।",
-"Error removing %s from favorites." => "প্রিয় থেকে %s সরিয়ে ফেলতে সমস্যা দেখা দিয়েছে।",
 "Sunday" => "রবিবার",
 "Monday" => "সোমবার",
 "Tuesday" => "মঙ্গলবার",
@@ -44,12 +37,9 @@ $TRANSLATIONS = array(
 "Ok" => "তথাস্তু",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "বাতির",
-"The object type is not specified." => "অবজেক্টের ধরণটি সুনির্দিষ্ট নয়।",
-"Error" => "সমস্যা",
-"The app name is not specified." => "অ্যাপের নামটি  সুনির্দিষ্ট নয়।",
-"The required file {file} is not installed!" => "আবশ্যিক {file} টি সংস্থাপিত নেই !",
 "Shared" => "ভাগাভাগিকৃত",
 "Share" => "ভাগাভাগি কর",
+"Error" => "সমস্যা",
 "Error while sharing" => "ভাগাভাগি করতে সমস্যা দেখা দিয়েছে  ",
 "Error while unsharing" => "ভাগাভাগি বাতিল করতে সমস্যা দেখা দিয়েছে",
 "Error while changing permissions" => "অনুমতিসমূহ  পরিবর্তন করতে সমস্যা দেখা দিয়েছে",
@@ -80,6 +70,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "পাঠানো হচ্ছে......",
 "Email sent" => "ই-মেইল পাঠানো হয়েছে",
 "Warning" => "সতর্কবাণী",
+"The object type is not specified." => "অবজেক্টের ধরণটি সুনির্দিষ্ট নয়।",
+"Delete" => "মুছে",
+"Add" => "যোগ কর",
 "Use the following link to reset your password: {link}" => "আপনার কূটশব্দটি পূনঃনির্ধারণ  করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}",
 "You will receive a link to reset your password via Email." => "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।",
 "Username" => "ব্যবহারকারী",
@@ -95,8 +88,6 @@ $TRANSLATIONS = array(
 "Help" => "সহায়িকা",
 "Access forbidden" => "অধিগমনের অনুমতি নেই",
 "Cloud not found" => "ক্লাউড খুঁজে পাওয়া গেল না",
-"Edit categories" => "ক্যাটেগরি সম্পাদনা",
-"Add" => "যোগ কর",
 "Security Warning" => "নিরাপত্তাজনিত সতর্কতা",
 "Create an <strong>admin account</strong>" => "<strong>প্রশাসক একাউন্ট</strong> তৈরী করুন",
 "Advanced" => "সুচারু",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index d85da45b5d6ea4038d47851650314dfcbba2db58..cd6bca1bd104b25beb1e66c045434cf21b785390 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -8,14 +8,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "Actualitzant la memòria de cau del fitxers, això pot trigar molt...",
 "Updated filecache" => "Actualitzada la memòria de cau dels fitxers",
 "... %d%% done ..." => "... %d%% fet ...",
-"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: %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.",
-"No categories selected for deletion." => "No hi ha categories per eliminar.",
-"Error removing %s from favorites." => "Error en eliminar %s dels preferits.",
 "No image or file provided" => "No s'han proporcionat imatges o fitxers",
 "Unknown filetype" => "Tipus de fitxer desconegut",
 "Invalid image" => "Imatge no vàlida",
@@ -67,12 +59,9 @@ $TRANSLATIONS = array(
 "(all selected)" => "(selecciona-ho tot)",
 "({count} selected)" => "({count} seleccionats)",
 "Error loading file exists template" => "Error en carregar la plantilla de fitxer existent",
-"The object type is not specified." => "No s'ha especificat el tipus d'objecte.",
-"Error" => "Error",
-"The app name is not specified." => "No s'ha especificat el nom de l'aplicació.",
-"The required file {file} is not installed!" => "El fitxer requerit {file} no està instal·lat!",
 "Shared" => "Compartit",
 "Share" => "Comparteix",
+"Error" => "Error",
 "Error while sharing" => "Error en compartir",
 "Error while unsharing" => "Error en deixar de compartir",
 "Error while changing permissions" => "Error en canviar els permisos",
@@ -104,6 +93,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Enviant...",
 "Email sent" => "El correu electrónic s'ha enviat",
 "Warning" => "Avís",
+"The object type is not specified." => "No s'ha especificat el tipus d'objecte.",
+"Delete" => "Esborra",
+"Add" => "Afegeix",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'actualització ha estat incorrecte. Comuniqueu aquest error a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">la comunitat ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "L'actualització ha estat correcte. Ara us redirigim a ownCloud.",
 "%s password reset" => "restableix la contrasenya %s",
@@ -126,8 +118,6 @@ $TRANSLATIONS = array(
 "Help" => "Ajuda",
 "Access forbidden" => "Accés prohibit",
 "Cloud not found" => "No s'ha trobat el núvol",
-"Edit categories" => "Edita les categories",
-"Add" => "Afegeix",
 "Security Warning" => "Avís de seguretat",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La versió de PHP que useu és vulnerable a l'atac per NULL Byte (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Actualitzeu la instal·lació de PHP per usar %s de forma segura.",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 4bd8bd07b708edb3a8247ec98388ce941c6e38d4..7a34915d6ac2638d42125e15c82583783c972ef8 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -8,14 +8,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "Aktualizuji souborovou mezipaměť, toto může trvat opravdu dlouho...",
 "Updated filecache" => "Aktualizována souborová mezipaměť",
 "... %d%% done ..." => "... %d%% dokončeno ...",
-"Category type not provided." => "Nezadán typ kategorie.",
-"No category to add?" => "Žádná kategorie k přidání?",
-"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.",
-"No categories selected for deletion." => "Žádné kategorie nebyly vybrány ke smazání.",
-"Error removing %s from favorites." => "Chyba při odebírání %s z oblíbených.",
 "No image or file provided" => "Soubor nebo obrázek nebyl zadán",
 "Unknown filetype" => "Neznámý typ souboru",
 "Invalid image" => "Chybný obrázek",
@@ -63,12 +55,9 @@ $TRANSLATIONS = array(
 "Which files do you want to keep?" => "Které soubory chcete ponechat?",
 "Cancel" => "Zrušit",
 "Continue" => "Pokračovat",
-"The object type is not specified." => "Není určen typ objektu.",
-"Error" => "Chyba",
-"The app name is not specified." => "Není určen název aplikace.",
-"The required file {file} is not installed!" => "Požadovaný soubor {file} není nainstalován!",
 "Shared" => "Sdílené",
 "Share" => "Sdílet",
+"Error" => "Chyba",
 "Error while sharing" => "Chyba při sdílení",
 "Error while unsharing" => "Chyba při rušení sdílení",
 "Error while changing permissions" => "Chyba při změně oprávnění",
@@ -100,6 +89,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Odesílám ...",
 "Email sent" => "E-mail odeslán",
 "Warning" => "Varování",
+"The object type is not specified." => "Není určen typ objektu.",
+"Delete" => "Smazat",
+"Add" => "Přidat",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizace neproběhla úspěšně. Nahlaste prosím problém do <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">evidence chyb ownCloud</a>",
 "The update was successful. Redirecting you to ownCloud now." => "Aktualizace byla úspěšná. Přesměrovávám na ownCloud.",
 "%s password reset" => "reset hesla %s",
@@ -122,8 +114,6 @@ $TRANSLATIONS = array(
 "Help" => "Nápověda",
 "Access forbidden" => "Přístup zakázán",
 "Cloud not found" => "Cloud nebyl nalezen",
-"Edit categories" => "Upravit kategorie",
-"Add" => "Přidat",
 "Security Warning" => "Bezpečnostní upozornění",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Verze vašeho PHP je napadnutelná pomocí techniky \"NULL Byte\" (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Aktualizujte prosím vaši instanci PHP pro bezpečné používání %s.",
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index 920fcad3d6bfc5b1088f59c0de08dc1ef4d992d1..6781382fa010674e65f27d9751709b9160f1d82d 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -1,14 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "group" => "grŵp",
-"Category type not provided." => "Math o gategori heb ei ddarparu.",
-"No category to add?" => "Dim categori i'w ychwanegu?",
-"This category already exists: %s" => "Mae'r categori hwn eisoes yn bodoli: %s",
-"Object type not provided." => "Math o wrthrych heb ei ddarparu.",
-"%s ID not provided." => "%s ID heb ei ddarparu.",
-"Error adding %s to favorites." => "Gwall wrth ychwanegu %s at ffefrynnau.",
-"No categories selected for deletion." => "Ni ddewiswyd categorïau i'w dileu.",
-"Error removing %s from favorites." => "Gwall wrth dynnu %s o ffefrynnau.",
 "Sunday" => "Sul",
 "Monday" => "Llun",
 "Tuesday" => "Mawrth",
@@ -46,12 +38,9 @@ $TRANSLATIONS = array(
 "Ok" => "Iawn",
 "_{count} file conflict_::_{count} file conflicts_" => array("","","",""),
 "Cancel" => "Diddymu",
-"The object type is not specified." => "Nid yw'r math o wrthrych wedi cael ei nodi.",
-"Error" => "Gwall",
-"The app name is not specified." => "Nid yw enw'r pecyn wedi cael ei nodi.",
-"The required file {file} is not installed!" => "Nid yw'r ffeil ofynnol {file} wedi ei gosod!",
 "Shared" => "Rhannwyd",
 "Share" => "Rhannu",
+"Error" => "Gwall",
 "Error while sharing" => "Gwall wrth rannu",
 "Error while unsharing" => "Gwall wrth ddad-rannu",
 "Error while changing permissions" => "Gwall wrth newid caniatâd",
@@ -82,6 +71,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Yn anfon ...",
 "Email sent" => "Anfonwyd yr e-bost",
 "Warning" => "Rhybudd",
+"The object type is not specified." => "Nid yw'r math o wrthrych wedi cael ei nodi.",
+"Delete" => "Dileu",
+"Add" => "Ychwanegu",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Methodd y diweddariad. Adroddwch y mater hwn i <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">gymuned ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.",
 "Use the following link to reset your password: {link}" => "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}",
@@ -101,8 +93,6 @@ $TRANSLATIONS = array(
 "Help" => "Cymorth",
 "Access forbidden" => "Mynediad wedi'i wahardd",
 "Cloud not found" => "Methwyd canfod cwmwl",
-"Edit categories" => "Golygu categorïau",
-"Add" => "Ychwanegu",
 "Security Warning" => "Rhybudd Diogelwch",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Mae eich fersiwn PHP yn agored i ymosodiad NULL Byte (CVE-2006-7243)",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Does dim cynhyrchydd rhifau hap diogel ar gael, galluogwch estyniad PHP OpenSSL.",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index b28e8a969b48c36da51cb0e5c2131cb57e433477..93fad7047d66446c269a346be1e40355696dd984 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -8,14 +8,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "Opdatere filcache, dette kan tage rigtigt lang tid...",
 "Updated filecache" => "Opdaterede filcache",
 "... %d%% done ..." => "... %d%% færdig ...",
-"Category type not provided." => "Kategori typen ikke er fastsat.",
-"No category to add?" => "Ingen kategori at tilføje?",
-"This category already exists: %s" => "Kategorien eksisterer allerede: %s",
-"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.",
-"No categories selected for deletion." => "Ingen kategorier valgt",
-"Error removing %s from favorites." => "Fejl ved fjernelse af %s fra favoritter.",
 "No image or file provided" => "Ingen fil eller billede givet",
 "Unknown filetype" => "Ukendt filtype",
 "Invalid image" => "Ugyldigt billede",
@@ -67,12 +59,9 @@ $TRANSLATIONS = array(
 "(all selected)" => "(alle valgt)",
 "({count} selected)" => "({count} valgt)",
 "Error loading file exists template" => "Fejl ved inlæsning af; fil eksistere skabelon",
-"The object type is not specified." => "Objekttypen er ikke angivet.",
-"Error" => "Fejl",
-"The app name is not specified." => "Den app navn er ikke angivet.",
-"The required file {file} is not installed!" => "Den krævede fil {file} er ikke installeret!",
 "Shared" => "Delt",
 "Share" => "Del",
+"Error" => "Fejl",
 "Error while sharing" => "Fejl under deling",
 "Error while unsharing" => "Fejl under annullering af deling",
 "Error while changing permissions" => "Fejl under justering af rettigheder",
@@ -104,6 +93,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Sender ...",
 "Email sent" => "E-mail afsendt",
 "Warning" => "Advarsel",
+"The object type is not specified." => "Objekttypen er ikke angivet.",
+"Delete" => "Slet",
+"Add" => "Tilføj",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Opdateringen blev ikke udført korrekt. Rapporter venligst problemet til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouds community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud.",
 "%s password reset" => "%s adgangskode nulstillet",
@@ -126,8 +118,6 @@ $TRANSLATIONS = array(
 "Help" => "Hjælp",
 "Access forbidden" => "Adgang forbudt",
 "Cloud not found" => "Sky ikke fundet",
-"Edit categories" => "Rediger kategorier",
-"Add" => "Tilføj",
 "Security Warning" => "Sikkerhedsadvarsel",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Din PHP-version er sårbar overfor et NULL Byte angreb (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Opdater venligst din PHP installation for at anvende %s sikkert.",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 7e292adcf397e761bcece95c9567131dc6a611d5..f70bfae0f94d650b944b040f617d9f3d6c84e931 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -9,14 +9,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "Aktualisiere Dateicache, dies könnte eine Weile dauern...",
 "Updated filecache" => "Dateicache aktualisiert",
 "... %d%% done ..." => "... %d%% erledigt ...",
-"Category type not provided." => "Kategorie nicht angegeben.",
-"No category to add?" => "Keine Kategorie hinzuzufügen?",
-"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.",
-"No categories selected for deletion." => "Es wurde keine Kategorien zum Löschen ausgewählt.",
-"Error removing %s from favorites." => "Fehler beim Entfernen von %s von den Favoriten.",
 "No image or file provided" => "Kein Bild oder Datei zur Verfügung gestellt",
 "Unknown filetype" => "Unbekannter Dateityp",
 "Invalid image" => "Ungültiges Bild",
@@ -68,12 +60,9 @@ $TRANSLATIONS = array(
 "(all selected)" => "(Alle ausgewählt)",
 "({count} selected)" => "({count} ausgewählt)",
 "Error loading file exists template" => "Fehler beim Laden der vorhanden Dateivorlage",
-"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
-"Error" => "Fehler",
-"The app name is not specified." => "Der App-Name ist nicht angegeben.",
-"The required file {file} is not installed!" => "Die benötigte Datei {file} ist nicht installiert.",
 "Shared" => "Geteilt",
 "Share" => "Teilen",
+"Error" => "Fehler",
 "Error while sharing" => "Fehler beim Teilen",
 "Error while unsharing" => "Fehler beim Aufheben der Freigabe",
 "Error while changing permissions" => "Fehler beim Ändern der Rechte",
@@ -106,6 +95,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Sende ...",
 "Email sent" => "E-Mail wurde verschickt",
 "Warning" => "Warnung",
+"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
+"Delete" => "Löschen",
+"Add" => "Hinzufügen",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet.",
 "%s password reset" => "%s-Passwort zurücksetzen",
@@ -131,8 +123,6 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo,\n\nich wollte Dich nur wissen lassen, dass %s %s mit Dir teilt.\nSchaue es Dir an: %s\n\n",
 "The share will expire on %s.\n\n" => "Die Freigabe wird ablaufen am %s.\n\n",
 "Cheers!" => "Hallo!",
-"Edit categories" => "Kategorien bearbeiten",
-"Add" => "Hinzufügen",
 "Security Warning" => "Sicherheitswarnung",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Deine PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
 "Please update your PHP installation to use %s securely." => "Bitte aktualisiere deine PHP-Installation um %s sicher nutzen zu können.",
@@ -157,6 +147,8 @@ $TRANSLATIONS = array(
 "Automatic logon rejected!" => "Automatischer Login zurückgewiesen!",
 "If you did not change your password recently, your account may be compromised!" => "Wenn Du Dein Passwort nicht vor kurzem geändert hast, könnte Dein\nAccount kompromittiert sein!",
 "Please change your password to secure your account again." => "Bitte ändere Dein Passwort, um Deinen Account wieder zu schützen.",
+"Server side authentication failed!" => "Serverseitige Authentifizierung fehlgeschlagen!",
+"Please contact your administrator." => "Bitte kontaktiere Deinen Administrator.",
 "Lost your password?" => "Passwort vergessen?",
 "remember" => "merken",
 "Log in" => "Einloggen",
diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php
index 1f79e977cc9c59db0d572f203ee90f23cd375ba2..e3e48a718d7cc7a72ad233557cf291f19ff2a6c9 100644
--- a/core/l10n/de_CH.php
+++ b/core/l10n/de_CH.php
@@ -2,14 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s teilt »%s« mit Ihnen",
 "group" => "Gruppe",
-"Category type not provided." => "Kategorie nicht angegeben.",
-"No category to add?" => "Keine Kategorie hinzuzufügen?",
-"This category already exists: %s" => "Die nachfolgende Kategorie existiert bereits: %s",
-"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.",
-"No categories selected for deletion." => "Es wurden keine Kategorien zum Löschen ausgewählt.",
-"Error removing %s from favorites." => "Fehler beim Entfernen von %s von den Favoriten.",
 "Sunday" => "Sonntag",
 "Monday" => "Montag",
 "Tuesday" => "Dienstag",
@@ -47,12 +39,9 @@ $TRANSLATIONS = array(
 "Ok" => "OK",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Abbrechen",
-"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
-"Error" => "Fehler",
-"The app name is not specified." => "Der App-Name ist nicht angegeben.",
-"The required file {file} is not installed!" => "Die benötigte Datei {file} ist nicht installiert!",
 "Shared" => "Geteilt",
 "Share" => "Teilen",
+"Error" => "Fehler",
 "Error while sharing" => "Fehler beim Teilen",
 "Error while unsharing" => "Fehler beim Aufheben der Freigabe",
 "Error while changing permissions" => "Fehler bei der Änderung der Rechte",
@@ -84,6 +73,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Sende ...",
 "Email sent" => "Email gesendet",
 "Warning" => "Warnung",
+"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
+"Delete" => "Löschen",
+"Add" => "Hinzufügen",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
 "%s password reset" => "%s-Passwort zurücksetzen",
@@ -106,8 +98,6 @@ $TRANSLATIONS = array(
 "Help" => "Hilfe",
 "Access forbidden" => "Zugriff verboten",
 "Cloud not found" => "Cloud wurde nicht gefunden",
-"Edit categories" => "Kategorien ändern",
-"Add" => "Hinzufügen",
 "Security Warning" => "Sicherheitshinweis",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
 "Please update your PHP installation to use %s securely." => "Bitte aktualisieren Sie Ihre PHP-Installation um %s sicher nutzen zu können.",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 95519c7d412a7154f0f22160c2410ae43ab89eb0..f11dbd36462b767994f571e97e59e00d5b5cb37a 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -9,14 +9,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "Aktualisiere Dateicache, dies könnte eine Weile dauern...",
 "Updated filecache" => "Dateicache aktualisiert",
 "... %d%% done ..." => "... %d%% erledigt ...",
-"Category type not provided." => "Kategorie nicht angegeben.",
-"No category to add?" => "Keine Kategorie hinzuzufügen?",
-"This category already exists: %s" => "Die nachfolgende Kategorie existiert bereits: %s",
-"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.",
-"No categories selected for deletion." => "Es wurden keine Kategorien zum Löschen ausgewählt.",
-"Error removing %s from favorites." => "Fehler beim Entfernen von %s von den Favoriten.",
 "No image or file provided" => "Kein Bild oder Datei zur Verfügung gestellt",
 "Unknown filetype" => "Unbekannter Dateityp",
 "Invalid image" => "Ungültiges Bild",
@@ -68,12 +60,9 @@ $TRANSLATIONS = array(
 "(all selected)" => "(Alle ausgewählt)",
 "({count} selected)" => "({count} ausgewählt)",
 "Error loading file exists template" => "Fehler beim Laden der vorhanden Dateivorlage",
-"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
-"Error" => "Fehler",
-"The app name is not specified." => "Der App-Name ist nicht angegeben.",
-"The required file {file} is not installed!" => "Die benötigte Datei {file} ist nicht installiert!",
 "Shared" => "Geteilt",
 "Share" => "Teilen",
+"Error" => "Fehler",
 "Error while sharing" => "Fehler beim Teilen",
 "Error while unsharing" => "Fehler beim Aufheben der Freigabe",
 "Error while changing permissions" => "Fehler bei der Änderung der Rechte",
@@ -106,6 +95,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Sende ...",
 "Email sent" => "Email gesendet",
 "Warning" => "Warnung",
+"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
+"Delete" => "Löschen",
+"Add" => "Hinzufügen",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
 "%s password reset" => "%s-Passwort zurücksetzen",
@@ -131,8 +123,6 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo,\n\nich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.\nSchauen Sie es sich an: %s\n\n",
 "The share will expire on %s.\n\n" => "Die Freigabe wird ablaufen am %s.\n\n",
 "Cheers!" => "Hallo!",
-"Edit categories" => "Kategorien ändern",
-"Add" => "Hinzufügen",
 "Security Warning" => "Sicherheitshinweis",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
 "Please update your PHP installation to use %s securely." => "Bitte aktualisieren Sie Ihre PHP-Installation um %s sicher nutzen zu können.",
@@ -157,6 +147,8 @@ $TRANSLATIONS = array(
 "Automatic logon rejected!" => "Automatische Anmeldung verweigert!",
 "If you did not change your password recently, your account may be compromised!" => "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAccount kompromittiert sein!",
 "Please change your password to secure your account again." => "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern.",
+"Server side authentication failed!" => "Serverseitige Authentifizierung fehlgeschlagen!",
+"Please contact your administrator." => "Bitte kontaktieren Sie Ihren Administrator.",
 "Lost your password?" => "Passwort vergessen?",
 "remember" => "merken",
 "Log in" => "Einloggen",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index fd5987d02ae5e40be98a3c6542ef1c0c4bdf8c34..0348babe56c46cdac8421a0676fdf3cc9a6836e4 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -2,14 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "Ο %s διαμοιράστηκε μαζί σας το »%s«",
 "group" => "ομάδα",
-"Category type not provided." => "Δεν δώθηκε τύπος κατηγορίας.",
-"No category to add?" => "Δεν έχετε κατηγορία να προσθέσετε;",
-"This category already exists: %s" => "Αυτή η κατηγορία υπάρχει ήδη: %s",
-"Object type not provided." => "Δεν δώθηκε τύπος αντικειμένου.",
-"%s ID not provided." => "Δεν δώθηκε η ID για %s.",
-"Error adding %s to favorites." => "Σφάλμα προσθήκης %s στα αγαπημένα.",
-"No categories selected for deletion." => "Δεν επιλέχτηκαν κατηγορίες για διαγραφή.",
-"Error removing %s from favorites." => "Σφάλμα αφαίρεσης %s από τα αγαπημένα.",
 "Sunday" => "Κυριακή",
 "Monday" => "Δευτέρα",
 "Tuesday" => "Τρίτη",
@@ -47,12 +39,9 @@ $TRANSLATIONS = array(
 "Ok" => "Οκ",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Άκυρο",
-"The object type is not specified." => "Δεν καθορίστηκε ο τύπος του αντικειμένου.",
-"Error" => "Σφάλμα",
-"The app name is not specified." => "Δεν καθορίστηκε το όνομα της εφαρμογής.",
-"The required file {file} is not installed!" => "Το απαιτούμενο αρχείο {file} δεν εγκαταστάθηκε!",
 "Shared" => "Κοινόχρηστα",
 "Share" => "Διαμοιρασμός",
+"Error" => "Σφάλμα",
 "Error while sharing" => "Σφάλμα κατά τον διαμοιρασμό",
 "Error while unsharing" => "Σφάλμα κατά το σταμάτημα του διαμοιρασμού",
 "Error while changing permissions" => "Σφάλμα κατά την αλλαγή των δικαιωμάτων",
@@ -84,6 +73,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Αποστολή...",
 "Email sent" => "Το Email απεστάλη ",
 "Warning" => "Προειδοποίηση",
+"The object type is not specified." => "Δεν καθορίστηκε ο τύπος του αντικειμένου.",
+"Delete" => "Διαγραφή",
+"Add" => "Προσθήκη",
 "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.",
 "Use the following link to reset your password: {link}" => "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
@@ -105,8 +97,6 @@ $TRANSLATIONS = array(
 "Help" => "Βοήθεια",
 "Access forbidden" => "Δεν επιτρέπεται η πρόσβαση",
 "Cloud not found" => "Δεν βρέθηκε νέφος",
-"Edit categories" => "Επεξεργασία κατηγοριών",
-"Add" => "Προσθήκη",
 "Security Warning" => "Προειδοποίηση Ασφαλείας",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Η PHP ειναι ευαλωτη στην NULL Byte επιθεση (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Παρακαλώ ενημερώστε την εγκατάσταση της PHP ώστε να χρησιμοποιήσετε το %s με ασφάλεια.",
diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php
index c69cf59f384cd56a2525115deadad1444073d974..389933044e0c683b9eaa07ab70e1086dfb07f910 100644
--- a/core/l10n/en_GB.php
+++ b/core/l10n/en_GB.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s shared \"%s\" with you",
+"Couldn't send mail to following users: %s " => "Couldn't send mail to following users: %s ",
 "group" => "group",
 "Turned on maintenance mode" => "Turned on maintenance mode",
 "Turned off maintenance mode" => "Turned off maintenance mode",
@@ -8,14 +9,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "Updating filecache, this may take a really long time...",
 "Updated filecache" => "Updated filecache",
 "... %d%% done ..." => "... %d%% done ...",
-"Category type not provided." => "Category type not provided.",
-"No category to add?" => "No category to add?",
-"This category already exists: %s" => "This category already exists: %s",
-"Object type not provided." => "Object type not provided.",
-"%s ID not provided." => "%s ID not provided.",
-"Error adding %s to favorites." => "Error adding %s to favourites.",
-"No categories selected for deletion." => "No categories selected for deletion.",
-"Error removing %s from favorites." => "Error removing %s from favourites.",
 "No image or file provided" => "No image or file provided",
 "Unknown filetype" => "Unknown filetype",
 "Invalid image" => "Invalid image",
@@ -67,12 +60,9 @@ $TRANSLATIONS = array(
 "(all selected)" => "(all selected)",
 "({count} selected)" => "({count} selected)",
 "Error loading file exists template" => "Error loading file exists template",
-"The object type is not specified." => "The object type is not specified.",
-"Error" => "Error",
-"The app name is not specified." => "The app name is not specified.",
-"The required file {file} is not installed!" => "The required file {file} is not installed!",
 "Shared" => "Shared",
 "Share" => "Share",
+"Error" => "Error",
 "Error while sharing" => "Error whilst sharing",
 "Error while unsharing" => "Error whilst unsharing",
 "Error while changing permissions" => "Error whilst changing permissions",
@@ -92,6 +82,7 @@ $TRANSLATIONS = array(
 "Resharing is not allowed" => "Resharing is not allowed",
 "Shared in {item} with {user}" => "Shared in {item} with {user}",
 "Unshare" => "Unshare",
+"notify user by email" => "notify user by email",
 "can edit" => "can edit",
 "access control" => "access control",
 "create" => "create",
@@ -104,6 +95,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Sending ...",
 "Email sent" => "Email sent",
 "Warning" => "Warning",
+"The object type is not specified." => "The object type is not specified.",
+"Delete" => "Delete",
+"Add" => "Add",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "The update was successful. Redirecting you to ownCloud now.",
 "%s password reset" => "%s password reset",
@@ -126,8 +120,9 @@ $TRANSLATIONS = array(
 "Help" => "Help",
 "Access forbidden" => "Access denied",
 "Cloud not found" => "Cloud not found",
-"Edit categories" => "Edit categories",
-"Add" => "Add",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n",
+"The share will expire on %s.\n\n" => "The share will expire on %s.\n\n",
+"Cheers!" => "Cheers!",
 "Security Warning" => "Security Warning",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Please update your PHP installation to use %s securely.",
@@ -146,15 +141,20 @@ $TRANSLATIONS = array(
 "Database tablespace" => "Database tablespace",
 "Database host" => "Database host",
 "Finish setup" => "Finish setup",
+"Finishing …" => "Finishing …",
 "%s is available. Get more information on how to update." => "%s is available. Get more information on how to update.",
 "Log out" => "Log out",
 "Automatic logon rejected!" => "Automatic logon rejected!",
 "If you did not change your password recently, your account may be compromised!" => "If you did not change your password recently, your account may be compromised!",
 "Please change your password to secure your account again." => "Please change your password to secure your account again.",
+"Server side authentication failed!" => "Server side authentication failed!",
+"Please contact your administrator." => "Please contact your administrator.",
 "Lost your password?" => "Lost your password?",
 "remember" => "remember",
 "Log in" => "Log in",
 "Alternative Logins" => "Alternative Logins",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>",
+"The share will expire on %s.<br><br>" => "The share will expire on %s.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Updating ownCloud to version %s, this may take a while."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 2b416db470742830ad4cc3b211cde83b367983b2..24e845622c2932ce5768ef41b25477a645a76d86 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -2,14 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s kunhavigis “%s” kun vi",
 "group" => "grupo",
-"Category type not provided." => "Ne proviziĝis tipon de kategorio.",
-"No category to add?" => "Ĉu neniu kategorio estas aldonota?",
-"This category already exists: %s" => "Tiu kategorio jam ekzistas: %s",
-"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.",
-"No categories selected for deletion." => "Neniu kategorio elektiĝis por forigo.",
-"Error removing %s from favorites." => "Eraro dum forigo de %s el favoratoj.",
 "Sunday" => "dimanĉo",
 "Monday" => "lundo",
 "Tuesday" => "mardo",
@@ -47,12 +39,9 @@ $TRANSLATIONS = array(
 "Ok" => "Akcepti",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Nuligi",
-"The object type is not specified." => "Ne indikiĝis tipo de la objekto.",
-"Error" => "Eraro",
-"The app name is not specified." => "Ne indikiĝis nomo de la aplikaĵo.",
-"The required file {file} is not installed!" => "La necesa dosiero {file} ne instaliĝis!",
 "Shared" => "Dividita",
 "Share" => "Kunhavigi",
+"Error" => "Eraro",
 "Error while sharing" => "Eraro dum kunhavigo",
 "Error while unsharing" => "Eraro dum malkunhavigo",
 "Error while changing permissions" => "Eraro dum ŝanĝo de permesoj",
@@ -83,6 +72,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Sendante...",
 "Email sent" => "La retpoŝtaĵo sendiĝis",
 "Warning" => "Averto",
+"The object type is not specified." => "Ne indikiĝis tipo de la objekto.",
+"Delete" => "Forigi",
+"Add" => "Aldoni",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La ĝisdatigo estis malsukcese. Bonvolu raporti tiun problemon al la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouda komunumo</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.",
 "Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
@@ -102,8 +94,6 @@ $TRANSLATIONS = array(
 "Help" => "Helpo",
 "Access forbidden" => "Aliro estas malpermesata",
 "Cloud not found" => "La nubo ne estas trovita",
-"Edit categories" => "Redakti kategoriojn",
-"Add" => "Aldoni",
 "Security Warning" => "Sekureca averto",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ne disponeblas sekura generilo de hazardaj numeroj; bonvolu kapabligi la OpenSSL-kromaĵon por PHP.",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 29eea2dbf4936fedaf1a836bcb29f90e23fba5a7..29a947b47e74a2e07064d9883afc035cee5f6815 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s ha compatido  »%s« contigo",
+"Couldn't send mail to following users: %s " => "No se pudo enviar mensajes a los siguientes usuarios: %s",
 "group" => "grupo",
 "Turned on maintenance mode" => "Modo mantenimiento activado",
 "Turned off maintenance mode" => "Modo mantenimiento desactivado",
@@ -8,14 +9,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "Actualizando caché de archivos, esto puede tardar bastante tiempo...",
 "Updated filecache" => "Caché de archivos actualizada",
 "... %d%% done ..." => "... %d%% hecho ...",
-"Category type not provided." => "Tipo de categoría no proporcionado.",
-"No category to add?" => "¿Ninguna categoría para añadir?",
-"This category already exists: %s" => "Esta categoría ya existe: %s",
-"Object type not provided." => "Tipo de objeto no proporcionado.",
-"%s ID not provided." => "ID de %s no proporcionado.",
-"Error adding %s to favorites." => "Error añadiendo %s a favoritos.",
-"No categories selected for deletion." => "No hay categorías seleccionadas para borrar.",
-"Error removing %s from favorites." => "Error eliminando %s de los favoritos.",
 "No image or file provided" => "No se especificó ningún archivo o imagen",
 "Unknown filetype" => "Tipo de archivo desconocido",
 "Invalid image" => "Imagen inválida",
@@ -67,12 +60,9 @@ $TRANSLATIONS = array(
 "(all selected)" => "(seleccionados todos)",
 "({count} selected)" => "({count} seleccionados)",
 "Error loading file exists template" => "Error cargando plantilla de archivo existente",
-"The object type is not specified." => "El tipo de objeto no está especificado.",
-"Error" => "Error",
-"The app name is not specified." => "El nombre de la aplicación no está especificado.",
-"The required file {file} is not installed!" => "¡El fichero {file} es necesario y no está instalado!",
 "Shared" => "Compartido",
 "Share" => "Compartir",
+"Error" => "Error",
 "Error while sharing" => "Error al compartir",
 "Error while unsharing" => "Error al dejar de compartir",
 "Error while changing permissions" => "Error al cambiar permisos",
@@ -92,6 +82,7 @@ $TRANSLATIONS = array(
 "Resharing is not allowed" => "No se permite compartir de nuevo",
 "Shared in {item} with {user}" => "Compartido en {item} con {user}",
 "Unshare" => "Dejar de compartir",
+"notify user by email" => "notificar al usuario por correo electrónico",
 "can edit" => "puede editar",
 "access control" => "control de acceso",
 "create" => "crear",
@@ -104,6 +95,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Enviando...",
 "Email sent" => "Correo electrónico enviado",
 "Warning" => "Precaución",
+"The object type is not specified." => "El tipo de objeto no está especificado.",
+"Delete" => "Eliminar",
+"Add" => "Agregar",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
 "%s password reset" => "%s restablecer contraseña",
@@ -126,8 +120,9 @@ $TRANSLATIONS = array(
 "Help" => "Ayuda",
 "Access forbidden" => "Acceso denegado",
 "Cloud not found" => "No se encuentra la nube",
-"Edit categories" => "Editar categorías",
-"Add" => "Agregar",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hola:\n\nTan solo queremos informarte que %s compartió %s contigo.\nMíralo aquí: %s\n\n",
+"The share will expire on %s.\n\n" => "El objeto dejará de ser compartido el %s.\n\n",
+"Cheers!" => "¡Saludos!",
 "Security Warning" => "Advertencia de seguridad",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Su versión de PHP es vulnerable al ataque de Byte NULL (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Por favor, actualice su instalación PHP para usar %s con seguridad.",
@@ -146,15 +141,20 @@ $TRANSLATIONS = array(
 "Database tablespace" => "Espacio de tablas de la base de datos",
 "Database host" => "Host de la base de datos",
 "Finish setup" => "Completar la instalación",
+"Finishing …" => "Finalizando...",
 "%s is available. Get more information on how to update." => "%s esta disponible. Obtener mas información de como actualizar.",
 "Log out" => "Salir",
 "Automatic logon rejected!" => "¡Inicio de sesión automático rechazado!",
 "If you did not change your password recently, your account may be compromised!" => "Si no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!",
 "Please change your password to secure your account again." => "Por favor cambie su contraseña para asegurar su cuenta nuevamente.",
+"Server side authentication failed!" => "La autenticación a fallado en el servidor.",
+"Please contact your administrator." => "Sírvase contactar a su administrador.",
 "Lost your password?" => "¿Ha perdido su contraseña?",
 "remember" => "recordar",
 "Log in" => "Entrar",
 "Alternative Logins" => "Inicios de sesión alternativos",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hola:<br><br>tan solo queremos informarte que %s compartió «%s» contigo.<br><a href=\"%s\">¡Míralo acá!</a><br><br>",
+"The share will expire on %s.<br><br>" => "El objeto dejará de ser compartido el %s.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 7d7e29c8ffb6c29e2648725a3469be0dac13bab1..195db409ab9a1f98ce72171c43cf937cd07fe2c7 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -8,14 +8,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "Actualizando caché de archivos, esto puede tardar mucho tiempo...",
 "Updated filecache" => "Caché de archivos actualizada",
 "... %d%% done ..." => "... %d%% hecho ...",
-"Category type not provided." => "Tipo de categoría no provisto. ",
-"No category to add?" => "¿Ninguna categoría para añadir?",
-"This category already exists: %s" => "Esta categoría ya existe: %s",
-"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. ",
-"No categories selected for deletion." => "No se seleccionaron categorías para borrar.",
-"Error removing %s from favorites." => "Error al borrar %s de favoritos. ",
 "Sunday" => "Domingo",
 "Monday" => "Lunes",
 "Tuesday" => "Martes",
@@ -53,12 +45,9 @@ $TRANSLATIONS = array(
 "Ok" => "Aceptar",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Cancelar",
-"The object type is not specified." => "El tipo de objeto no está especificado. ",
-"Error" => "Error",
-"The app name is not specified." => "El nombre de la App no está especificado.",
-"The required file {file} is not installed!" => "¡El archivo requerido {file} no está instalado!",
 "Shared" => "Compartido",
 "Share" => "Compartir",
+"Error" => "Error",
 "Error while sharing" => "Error al compartir",
 "Error while unsharing" => "Error en al dejar de compartir",
 "Error while changing permissions" => "Error al cambiar permisos",
@@ -90,6 +79,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Mandando...",
 "Email sent" => "e-mail mandado",
 "Warning" => "Atención",
+"The object type is not specified." => "El tipo de objeto no está especificado. ",
+"Delete" => "Borrar",
+"Add" => "Agregar",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización no pudo ser completada. Por favor, reportá el inconveniente a la comunidad <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
 "%s password reset" => "%s restablecer contraseña",
@@ -112,8 +104,6 @@ $TRANSLATIONS = array(
 "Help" => "Ayuda",
 "Access forbidden" => "Acceso prohibido",
 "Cloud not found" => "No se encontró ownCloud",
-"Edit categories" => "Editar categorías",
-"Add" => "Agregar",
 "Security Warning" => "Advertencia de seguridad",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La versión de PHP que tenés, es vulnerable al ataque de byte NULL (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Por favor, actualizá tu instalación PHP para poder usar %s de manera segura.",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 7b26850166d2daaf89ce5e3c9f73d3ae33c49c6a..7bc6d2a7437ad55162be637e3da2da0421424eff 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -9,14 +9,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "Uuendan failipuhvrit, see võib kesta väga kaua...",
 "Updated filecache" => "Uuendatud failipuhver",
 "... %d%% done ..." => "... %d%% tehtud ...",
-"Category type not provided." => "Kategooria tüüp puudub.",
-"No category to add?" => "Pole kategooriat, mida lisada?",
-"This category already exists: %s" => "See kategooria on juba olemas: %s",
-"Object type not provided." => "Objekti tüüb puudub.",
-"%s ID not provided." => "%s ID puudub.",
-"Error adding %s to favorites." => "Viga %s lisamisel lemmikutesse.",
-"No categories selected for deletion." => "Kustutamiseks pole kategooriat valitud.",
-"Error removing %s from favorites." => "Viga %s eemaldamisel lemmikutest.",
 "No image or file provided" => "Ühtegi pilti või faili ei pakutud",
 "Unknown filetype" => "Tundmatu failitüüp",
 "Invalid image" => "Vigane pilt",
@@ -62,16 +54,15 @@ $TRANSLATIONS = array(
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} failikonflikt","{count} failikonflikti"),
 "One file conflict" => "Üks failikonflikt",
 "Which files do you want to keep?" => "Milliseid faile sa soovid alles hoida?",
+"If you select both versions, the copied file will have a number added to its name." => "Kui valid mõlemad versioonid, siis lisatakse kopeeritud faili nimele number.",
 "Cancel" => "Loobu",
 "Continue" => "Jätka",
 "(all selected)" => "(kõik valitud)",
 "({count} selected)" => "({count} valitud)",
-"The object type is not specified." => "Objekti tüüp pole määratletud.",
-"Error" => "Viga",
-"The app name is not specified." => "Rakenduse nimi ole määratletud.",
-"The required file {file} is not installed!" => "Vajalikku faili {file} pole paigaldatud!",
+"Error loading file exists template" => "Viga faili olemasolu malli laadimisel",
 "Shared" => "Jagatud",
 "Share" => "Jaga",
+"Error" => "Viga",
 "Error while sharing" => "Viga jagamisel",
 "Error while unsharing" => "Viga jagamise lõpetamisel",
 "Error while changing permissions" => "Viga õiguste muutmisel",
@@ -104,6 +95,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Saatmine ...",
 "Email sent" => "E-kiri on saadetud",
 "Warning" => "Hoiatus",
+"The object type is not specified." => "Objekti tüüp pole määratletud.",
+"Delete" => "Kustuta",
+"Add" => "Lisa",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uuendus ebaõnnestus. Palun teavita probleemidest  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kogukonda</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi.",
 "%s password reset" => "%s parooli lähtestus",
@@ -129,8 +123,6 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hei,\n\nlihtsalt annan sulle teada, et %s jagas sulle välja %s.\nVaata seda: %s\n\n",
 "The share will expire on %s.\n\n" => "Jagamine aegub %s.\n\n",
 "Cheers!" => "Terekest!",
-"Edit categories" => "Muuda kategooriaid",
-"Add" => "Lisa",
 "Security Warning" => "Turvahoiatus",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Sinu PHP versioon on haavatav NULL Baidi (CVE-2006-7243) rünnakuga.",
 "Please update your PHP installation to use %s securely." => "Palun uuenda oma paigaldatud PHP-d tagamaks %s turvalisus.",
@@ -155,6 +147,8 @@ $TRANSLATIONS = array(
 "Automatic logon rejected!" => "Automaatne sisselogimine lükati tagasi!",
 "If you did not change your password recently, your account may be compromised!" => "Kui sa ei muutnud oma parooli hiljuti, siis võib su kasutajakonto olla ohustatud!",
 "Please change your password to secure your account again." => "Palun muuda parooli, et oma kasutajakonto uuesti turvata.",
+"Server side authentication failed!" => "Serveripoolne autentimine ebaõnnestus!",
+"Please contact your administrator." => "Palun kontakteeru oma süsteemihalduriga.",
 "Lost your password?" => "Kaotasid oma parooli?",
 "remember" => "pea meeles",
 "Log in" => "Logi sisse",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 2bf1b0607909d9c23523cf4e3ed79379cf24d3f7..50e4e12d7704a908234514775b5469f160a12b4f 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -2,14 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s-ek »%s« zurekin partekatu du",
 "group" => "taldea",
-"Category type not provided." => "Kategoria mota ez da zehaztu.",
-"No category to add?" => "Ez dago gehitzeko kategoriarik?",
-"This category already exists: %s" => "Kategoria hau dagoeneko existitzen da: %s",
-"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.",
-"No categories selected for deletion." => "Ez da ezabatzeko kategoriarik hautatu.",
-"Error removing %s from favorites." => "Errorea gertatu da %s gogokoetatik ezabatzean.",
 "Sunday" => "Igandea",
 "Monday" => "Astelehena",
 "Tuesday" => "Asteartea",
@@ -47,12 +39,9 @@ $TRANSLATIONS = array(
 "Ok" => "Ados",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Ezeztatu",
-"The object type is not specified." => "Objetu mota ez dago zehaztuta.",
-"Error" => "Errorea",
-"The app name is not specified." => "App izena ez dago zehaztuta.",
-"The required file {file} is not installed!" => "Beharrezkoa den {file} fitxategia ez dago instalatuta!",
 "Shared" => "Elkarbanatuta",
 "Share" => "Elkarbanatu",
+"Error" => "Errorea",
 "Error while sharing" => "Errore bat egon da elkarbanatzean",
 "Error while unsharing" => "Errore bat egon da elkarbanaketa desegitean",
 "Error while changing permissions" => "Errore bat egon da baimenak aldatzean",
@@ -84,6 +73,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Bidaltzen ...",
 "Email sent" => "Eposta bidalia",
 "Warning" => "Abisua",
+"The object type is not specified." => "Objetu mota ez dago zehaztuta.",
+"Delete" => "Ezabatu",
+"Add" => "Gehitu",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud komunitatearentzako</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.",
 "%s password reset" => "%s pasahitza berrezarri",
@@ -106,8 +98,6 @@ $TRANSLATIONS = array(
 "Help" => "Laguntza",
 "Access forbidden" => "Sarrera debekatuta",
 "Cloud not found" => "Ez da hodeia aurkitu",
-"Edit categories" => "Editatu kategoriak",
-"Add" => "Gehitu",
 "Security Warning" => "Segurtasun abisua",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Zure PHP bertsioa NULL Byte erasoak (CVE-2006-7243) mendera dezake.",
 "Please update your PHP installation to use %s securely." => "Mesedez eguneratu zure PHP instalazioa %s seguru erabiltzeko",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index e173d628f5f01d85e111de5831e79fb6bba9ca10..a9fc022b45a685dd02402372b93130e7abac43a0 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -2,14 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s به اشتراک گذاشته شده است »%s« توسط شما",
 "group" => "گروه",
-"Category type not provided." => "نوع دسته بندی ارائه نشده است.",
-"No category to add?" => "آیا گروه دیگری برای افزودن ندارید",
-"This category already exists: %s" => "این دسته هم اکنون وجود دارد: %s",
-"Object type not provided." => "نوع شی ارائه نشده است.",
-"%s ID not provided." => "شناسه %s  ارائه نشده است.",
-"Error adding %s to favorites." => "خطای اضافه کردن %s  به علاقه مندی ها.",
-"No categories selected for deletion." => "هیج دسته ای برای پاک شدن انتخاب نشده است",
-"Error removing %s from favorites." => "خطای پاک کردن %s از علاقه مندی ها.",
 "Sunday" => "یکشنبه",
 "Monday" => "دوشنبه",
 "Tuesday" => "سه شنبه",
@@ -47,12 +39,9 @@ $TRANSLATIONS = array(
 "Ok" => "قبول",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
 "Cancel" => "منصرف شدن",
-"The object type is not specified." => "نوع شی تعیین نشده است.",
-"Error" => "خطا",
-"The app name is not specified." => "نام برنامه تعیین نشده است.",
-"The required file {file} is not installed!" => "پرونده { پرونده} درخواست شده نصب نشده است !",
 "Shared" => "اشتراک گذاشته شده",
 "Share" => "اشتراک‌گذاری",
+"Error" => "خطا",
 "Error while sharing" => "خطا درحال به اشتراک گذاشتن",
 "Error while unsharing" => "خطا درحال لغو اشتراک",
 "Error while changing permissions" => "خطا در حال تغییر مجوز",
@@ -84,6 +73,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "درحال ارسال ...",
 "Email sent" => "ایمیل ارسال شد",
 "Warning" => "اخطار",
+"The object type is not specified." => "نوع شی تعیین نشده است.",
+"Delete" => "حذف",
+"Add" => "افزودن",
 "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.",
 "Use the following link to reset your password: {link}" => "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
@@ -105,8 +97,6 @@ $TRANSLATIONS = array(
 "Help" => "راه‌نما",
 "Access forbidden" => "اجازه دسترسی به مناطق ممنوعه را ندارید",
 "Cloud not found" => "پیدا نشد",
-"Edit categories" => "ویرایش گروه",
-"Add" => "افزودن",
 "Security Warning" => "اخطار امنیتی",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "نسخه ی PHP شما در برابر حملات NULL Byte آسیب پذیر است.(CVE-2006-7243)",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "هیچ مولد تصادفی امن در دسترس نیست، لطفا فرمت PHP OpenSSL را فعال نمایید.",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index c6c9f09e1dd66b36c2fc28e48489cf8afdc2b046..fee88e1c78fb802860aee3520587063bba43e1fb 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -9,12 +9,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "Päivitetään tiedostojen välimuistia, tämä saattaa kestää todella kauan...",
 "Updated filecache" => "Tiedostojen välimuisti päivitetty",
 "... %d%% done ..." => "... %d%% valmis ...",
-"Category type not provided." => "Luokan tyyppiä ei määritelty.",
-"No category to add?" => "Ei lisättävää luokkaa?",
-"This category already exists: %s" => "Luokka on jo olemassa: %s",
-"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.",
 "No image or file provided" => "Kuvaa tai tiedostoa ei määritelty",
 "Unknown filetype" => "Tuntematon tiedostotyyppi",
 "Invalid image" => "Virhellinen kuva",
@@ -61,11 +55,9 @@ $TRANSLATIONS = array(
 "Continue" => "Jatka",
 "(all selected)" => "(kaikki valittu)",
 "({count} selected)" => "({count} valittu)",
-"Error" => "Virhe",
-"The app name is not specified." => "Sovelluksen nimeä ei ole määritelty.",
-"The required file {file} is not installed!" => "Vaadittua tiedostoa {file} ei ole asennettu!",
 "Shared" => "Jaettu",
 "Share" => "Jaa",
+"Error" => "Virhe",
 "Error while sharing" => "Virhe jaettaessa",
 "Error while unsharing" => "Virhe jakoa peruttaessa",
 "Error while changing permissions" => "Virhe oikeuksia muuttaessa",
@@ -98,6 +90,8 @@ $TRANSLATIONS = array(
 "Sending ..." => "Lähetetään...",
 "Email sent" => "Sähköposti lähetetty",
 "Warning" => "Varoitus",
+"Delete" => "Poista",
+"Add" => "Lisää",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Päivitys epäonnistui. Ilmoita ongelmasta <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-yhteisölle</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.",
 "%s password reset" => "%s salasanan nollaus",
@@ -121,8 +115,6 @@ $TRANSLATIONS = array(
 "Cloud not found" => "Pilveä ei löydy",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hei sinä!\n\n%s jakoi kohteen %s kanssasi.\nTutustu siihen: %s\n\n",
 "The share will expire on %s.\n\n" => "Jakaminen päättyy %s.\n\n",
-"Edit categories" => "Muokkaa luokkia",
-"Add" => "Lisää",
 "Security Warning" => "Turvallisuusvaroitus",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-asennuksesi on haavoittuvainen NULL Byte -hyökkäykselle (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Päivitä PHP-asennus varmistaaksesi, että %s on turvallinen käyttää.",
@@ -146,6 +138,8 @@ $TRANSLATIONS = array(
 "Automatic logon rejected!" => "Automaattinen sisäänkirjautuminen hylättiin!",
 "If you did not change your password recently, your account may be compromised!" => "Jos et vaihtanut salasanaasi äskettäin, tilisi saattaa olla murrettu.",
 "Please change your password to secure your account again." => "Vaihda salasanasi suojataksesi tilisi uudelleen.",
+"Server side authentication failed!" => "Palvelimen puoleinen tunnistautuminen epäonnistui!",
+"Please contact your administrator." => "Ota yhteys ylläpitäjään.",
 "Lost your password?" => "Unohditko salasanasi?",
 "remember" => "muista",
 "Log in" => "Kirjaudu sisään",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 83460f43343bd49b7c7db6d0e864726f82cad4bc..82b93172a1ef4e90c778de38ee7c42d245f98f70 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s partagé »%s« avec vous",
+"Couldn't send mail to following users: %s " => "Impossible d'envoyer un mail aux utilisateurs suivant : %s",
 "group" => "groupe",
 "Turned on maintenance mode" => "Basculé en mode maintenance",
 "Turned off maintenance mode" => "Basculé en mode production (non maintenance)",
@@ -8,14 +9,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "En cours de mise à jour de cache de fichiers. Cette opération peut être très longue...",
 "Updated filecache" => "Cache de fichier mis à jour",
 "... %d%% done ..." => "... %d%% effectué ...",
-"Category type not provided." => "Type de catégorie non spécifié.",
-"No category to add?" => "Pas de catégorie à ajouter ?",
-"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.",
-"No categories selected for deletion." => "Pas de catégorie sélectionnée pour la suppression.",
-"Error removing %s from favorites." => "Erreur lors de la suppression de %s des favoris.",
 "No image or file provided" => "Aucune image ou fichier fourni",
 "Unknown filetype" => "Type de fichier inconnu",
 "Invalid image" => "Image invalide",
@@ -67,12 +60,9 @@ $TRANSLATIONS = array(
 "(all selected)" => "(tous sélectionnés)",
 "({count} selected)" => "({count} sélectionnés)",
 "Error loading file exists template" => "Erreur de chargement du modèle de fichier existant",
-"The object type is not specified." => "Le type d'objet n'est pas spécifié.",
-"Error" => "Erreur",
-"The app name is not specified." => "Le nom de l'application n'est pas spécifié.",
-"The required file {file} is not installed!" => "Le fichier requis {file} n'est pas installé !",
 "Shared" => "Partagé",
 "Share" => "Partager",
+"Error" => "Erreur",
 "Error while sharing" => "Erreur lors de la mise en partage",
 "Error while unsharing" => "Erreur lors de l'annulation du partage",
 "Error while changing permissions" => "Erreur lors du changement des permissions",
@@ -92,6 +82,7 @@ $TRANSLATIONS = array(
 "Resharing is not allowed" => "Le repartage n'est pas autorisé",
 "Shared in {item} with {user}" => "Partagé dans {item} avec {user}",
 "Unshare" => "Ne plus partager",
+"notify user by email" => "Prévenir l'utilisateur par couriel",
 "can edit" => "édition autorisée",
 "access control" => "contrôle des accès",
 "create" => "créer",
@@ -104,6 +95,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "En cours d'envoi ...",
 "Email sent" => "Email envoyé",
 "Warning" => "Attention",
+"The object type is not specified." => "Le type d'objet n'est pas spécifié.",
+"Delete" => "Supprimer",
+"Add" => "Ajouter",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La mise à jour a échoué. Veuillez signaler ce problème à la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">communauté ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud.",
 "%s password reset" => "Réinitialisation de votre mot de passe %s",
@@ -126,8 +120,9 @@ $TRANSLATIONS = array(
 "Help" => "Aide",
 "Access forbidden" => "Accès interdit",
 "Cloud not found" => "Introuvable",
-"Edit categories" => "Editer les catégories",
-"Add" => "Ajouter",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Bonjour,\n\nJuste pour vous signaler que %s a partagé %s avec vous.\nConsultez-le : %s\n",
+"The share will expire on %s.\n\n" => "Le partage expire le %s.\n\n",
+"Cheers!" => "Salutations!",
 "Security Warning" => "Avertissement de sécurité",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Votre version de PHP est vulnérable à l'attaque par caractère NULL (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Veuillez mettre à jour votre installation PHP pour utiliser %s de façon sécurisée.",
@@ -146,15 +141,20 @@ $TRANSLATIONS = array(
 "Database tablespace" => "Tablespaces de la base de données",
 "Database host" => "Serveur de la base de données",
 "Finish setup" => "Terminer l'installation",
+"Finishing …" => "En cours de finalisation...",
 "%s is available. Get more information on how to update." => "%s est disponible. Obtenez plus d'informations sur la façon de mettre à jour.",
 "Log out" => "Se déconnecter",
 "Automatic logon rejected!" => "Connexion automatique rejetée !",
 "If you did not change your password recently, your account may be compromised!" => "Si vous n'avez pas changé votre mot de passe récemment, votre compte risque d'être compromis !",
 "Please change your password to secure your account again." => "Veuillez changer votre mot de passe pour sécuriser à nouveau votre compte.",
+"Server side authentication failed!" => "L'authentification côté serveur a échoué !",
+"Please contact your administrator." => "Veuillez contacter votre administrateur.",
 "Lost your password?" => "Mot de passe perdu ?",
 "remember" => "se souvenir de moi",
 "Log in" => "Connexion",
 "Alternative Logins" => "Logins alternatifs",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Bonjour,<br><br>Juste pour vous informer que %s a partagé »%s« avec vous.<br><a href=\"%s\">Consultez-le !</a><br><br>",
+"The share will expire on %s.<br><br>" => "Le partage expirera le %s.<br><br>",
 "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."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 3325a894f483981eabc582efba68da2817a346d2..c8dbb9e9c55094632e8f329da3c4790df55e17ab 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -9,14 +9,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "Actualizando o ficheiro da caché, isto pode levar bastante tempo...",
 "Updated filecache" => "Ficheiro da caché actualizado",
 "... %d%% done ..." => "... %d%% feito ...",
-"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: %s" => "Esta categoría xa existe: %s",
-"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.",
-"No categories selected for deletion." => "Non se seleccionaron categorías para eliminación.",
-"Error removing %s from favorites." => "Produciuse un erro ao eliminar %s dos favoritos.",
 "No image or file provided" => "Non forneceu ningunha imaxe ou ficheiro",
 "Unknown filetype" => "Tipo de ficheiro descoñecido",
 "Invalid image" => "Imaxe incorrecta",
@@ -68,12 +60,9 @@ $TRANSLATIONS = array(
 "(all selected)" => "(todo o seleccionado)",
 "({count} selected)" => "({count} seleccionados)",
 "Error loading file exists template" => "Produciuse un erro ao cargar o modelo de ficheiro existente",
-"The object type is not specified." => "Non se especificou o tipo de obxecto.",
-"Error" => "Erro",
-"The app name is not specified." => "Non se especificou o nome do aplicativo.",
-"The required file {file} is not installed!" => "Non está instalado o ficheiro {file} que se precisa",
 "Shared" => "Compartir",
 "Share" => "Compartir",
+"Error" => "Erro",
 "Error while sharing" => "Produciuse un erro ao compartir",
 "Error while unsharing" => "Produciuse un erro ao deixar de compartir",
 "Error while changing permissions" => "Produciuse un erro ao cambiar os permisos",
@@ -106,6 +95,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Enviando...",
 "Email sent" => "Correo enviado",
 "Warning" => "Aviso",
+"The object type is not specified." => "Non se especificou o tipo de obxecto.",
+"Delete" => "Eliminar",
+"Add" => "Engadir",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A actualización non foi satisfactoria, informe deste problema á  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade de ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud.",
 "%s password reset" => "Restabelecer o contrasinal %s",
@@ -131,8 +123,6 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ola,\n\nsó facerlle saber que %s compartiu %s con vostede.\nVéxao en: %s\n\n",
 "The share will expire on %s.\n\n" => "Esta compartición caduca o %s.\n\n",
 "Cheers!" => "Saúdos!",
-"Edit categories" => "Editar as categorías",
-"Add" => "Engadir",
 "Security Warning" => "Aviso de seguranza",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "A súa versión de PHP é vulnerábel a un ataque de byte nulo (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Actualice a instalación de PHP para empregar %s de xeito seguro.",
@@ -157,6 +147,8 @@ $TRANSLATIONS = array(
 "Automatic logon rejected!" => "Rexeitouse a entrada automática",
 "If you did not change your password recently, your account may be compromised!" => "Se non fixo recentemente cambios de contrasinal é posíbel que a súa conta estea comprometida!",
 "Please change your password to secure your account again." => "Cambie de novo o seu contrasinal para asegurar a súa conta.",
+"Server side authentication failed!" => "A autenticación fracasou do lado do servidor!",
+"Please contact your administrator." => "Contacte co administrador.",
 "Lost your password?" => "Perdeu o contrasinal?",
 "remember" => "lembrar",
 "Log in" => "Conectar",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index 30ef27664ea687ee0f5dadb1e0f8a589717be9b8..5b81ec547d9784918dfa4bf1541e83c427e5076d 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -2,14 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s שיתף/שיתפה איתך את »%s«",
 "group" => "קבוצה",
-"Category type not provided." => "סוג הקטגוריה לא סופק.",
-"No category to add?" => "אין קטגוריה להוספה?",
-"This category already exists: %s" => "הקטגוריה הבאה כבר קיימת: %s",
-"Object type not provided." => "סוג הפריט לא סופק.",
-"%s ID not provided." => "מזהה %s לא סופק.",
-"Error adding %s to favorites." => "אירעה שגיאה בעת הוספת %s למועדפים.",
-"No categories selected for deletion." => "לא נבחרו קטגוריות למחיקה",
-"Error removing %s from favorites." => "שגיאה בהסרת %s מהמועדפים.",
 "Sunday" => "יום ראשון",
 "Monday" => "יום שני",
 "Tuesday" => "יום שלישי",
@@ -47,12 +39,9 @@ $TRANSLATIONS = array(
 "Ok" => "בסדר",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "ביטול",
-"The object type is not specified." => "סוג הפריט לא צוין.",
-"Error" => "שגיאה",
-"The app name is not specified." => "שם היישום לא צוין.",
-"The required file {file} is not installed!" => "הקובץ הנדרש {file} אינו מותקן!",
 "Shared" => "שותף",
 "Share" => "שתף",
+"Error" => "שגיאה",
 "Error while sharing" => "שגיאה במהלך השיתוף",
 "Error while unsharing" => "שגיאה במהלך ביטול השיתוף",
 "Error while changing permissions" => "שגיאה במהלך שינוי ההגדרות",
@@ -83,6 +72,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "מתבצעת שליחה ...",
 "Email sent" => "הודעת הדוא״ל נשלחה",
 "Warning" => "אזהרה",
+"The object type is not specified." => "סוג הפריט לא צוין.",
+"Delete" => "מחיקה",
+"Add" => "הוספה",
 "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.",
 "Use the following link to reset your password: {link}" => "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
@@ -103,8 +95,6 @@ $TRANSLATIONS = array(
 "Help" => "עזרה",
 "Access forbidden" => "הגישה נחסמה",
 "Cloud not found" => "ענן לא נמצא",
-"Edit categories" => "ערוך קטגוריות",
-"Add" => "הוספה",
 "Security Warning" => "אזהרת אבטחה",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "גרסת ה־PHP פגיעה בפני התקפת בית NULL/ריק (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "נא לעדכן את התקנת ה-PHP שלך כדי להשתמש ב-%s בצורה מאובטחת.",
diff --git a/core/l10n/hi.php b/core/l10n/hi.php
index ec9381c787d48cdb3ab7ffb0041f3e6b0c9e3a12..c8bfaac9267dc8318f817decfc18e155bf36fb11 100644
--- a/core/l10n/hi.php
+++ b/core/l10n/hi.php
@@ -1,8 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Category type not provided." => "कैटेगरी प्रकार उपलब्ध नहीं है",
-"This category already exists: %s" => "यह कैटेगरी पहले से ही मौजूद है: %s",
-"Object type not provided." => "ऑब्जेक्ट प्रकार नहीं दिया हुआ",
 "Sunday" => "रविवार",
 "Monday" => "सोमवार",
 "Tuesday" => "मंगलवार",
@@ -28,8 +25,8 @@ $TRANSLATIONS = array(
 "_%n day ago_::_%n days ago_" => array("",""),
 "_%n month ago_::_%n months ago_" => array("",""),
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Error" => "त्रुटि",
 "Share" => "साझा करें",
+"Error" => "त्रुटि",
 "Share with" => "के साथ साझा",
 "Password" => "पासवर्ड",
 "Send" => "भेजें",
@@ -37,6 +34,7 @@ $TRANSLATIONS = array(
 "Sending ..." => "भेजा जा रहा है",
 "Email sent" => "ईमेल भेज दिया गया है ",
 "Warning" => "चेतावनी ",
+"Add" => "डाले",
 "Use the following link to reset your password: {link}" => "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}",
 "You will receive a link to reset your password via Email." => "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|",
 "Username" => "प्रयोक्ता का नाम",
@@ -47,7 +45,6 @@ $TRANSLATIONS = array(
 "Apps" => "Apps",
 "Help" => "सहयोग",
 "Cloud not found" => "क्लौड नहीं मिला ",
-"Add" => "डाले",
 "Security Warning" => "सुरक्षा चेतावनी ",
 "Create an <strong>admin account</strong>" => "व्यवस्थापक खाता बनाएँ",
 "Advanced" => "उन्नत",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 7fa81db8a21b4515887e8373c237349a9a5a17bf..4278dfa7b051a9e78d48cb746e71b78b2125192b 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -1,7 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"No category to add?" => "Nemate kategorija koje možete dodati?",
-"No categories selected for deletion." => "Niti jedna kategorija nije odabrana za brisanje.",
 "Sunday" => "nedelja",
 "Monday" => "ponedeljak",
 "Tuesday" => "utorak",
@@ -39,8 +37,8 @@ $TRANSLATIONS = array(
 "Ok" => "U redu",
 "_{count} file conflict_::_{count} file conflicts_" => array("","",""),
 "Cancel" => "Odustani",
-"Error" => "Greška",
 "Share" => "Podijeli",
+"Error" => "Greška",
 "Error while sharing" => "Greška prilikom djeljenja",
 "Error while unsharing" => "Greška prilikom isključivanja djeljenja",
 "Error while changing permissions" => "Greška prilikom promjena prava",
@@ -63,6 +61,8 @@ $TRANSLATIONS = array(
 "Password protected" => "Zaštita lozinkom",
 "Error unsetting expiration date" => "Greška prilikom brisanja datuma isteka",
 "Error setting expiration date" => "Greška prilikom postavljanja datuma isteka",
+"Delete" => "Obriši",
+"Add" => "Dodaj",
 "Use the following link to reset your password: {link}" => "Koristite ovaj link da biste poništili lozinku: {link}",
 "You will receive a link to reset your password via Email." => "Primit ćete link kako biste poništili zaporku putem e-maila.",
 "Username" => "Korisničko ime",
@@ -78,8 +78,6 @@ $TRANSLATIONS = array(
 "Help" => "Pomoć",
 "Access forbidden" => "Pristup zabranjen",
 "Cloud not found" => "Cloud nije pronađen",
-"Edit categories" => "Uredi kategorije",
-"Add" => "Dodaj",
 "Create an <strong>admin account</strong>" => "Stvori <strong>administratorski račun</strong>",
 "Advanced" => "Napredno",
 "Data folder" => "Mapa baze podataka",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 2cc473a9c01695a75ac56ac11d1336036ec81da7..f2d9d1ba22ad5cf1e2fb50c12ed28821f922954e 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -8,14 +8,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "A filecache frissítése folyamatban, ez a folyamat hosszabb ideig is eltarthat...",
 "Updated filecache" => "Filecache frissítve",
 "... %d%% done ..." => "... %d%% kész ...",
-"Category type not provided." => "Nincs megadva a kategória típusa.",
-"No category to add?" => "Nincs hozzáadandó kategória?",
-"This category already exists: %s" => "Ez a kategória már létezik: %s",
-"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",
-"No categories selected for deletion." => "Nincs törlésre jelölt kategória",
-"Error removing %s from favorites." => "Nem sikerült a kedvencekből törölni ezt: %s",
 "No image or file provided" => "Nincs kép vagy file megadva",
 "Unknown filetype" => "Ismeretlen file tipús",
 "Invalid image" => "Hibás kép",
@@ -67,12 +59,9 @@ $TRANSLATIONS = array(
 "(all selected)" => "(all selected)",
 "({count} selected)" => "({count} kiválasztva)",
 "Error loading file exists template" => "Hiba a létező sablon betöltésekor",
-"The object type is not specified." => "Az objektum típusa nincs megadva.",
-"Error" => "Hiba",
-"The app name is not specified." => "Az alkalmazás neve nincs megadva.",
-"The required file {file} is not installed!" => "A szükséges fájl: {file} nincs telepítve!",
 "Shared" => "Megosztott",
 "Share" => "Megosztás",
+"Error" => "Hiba",
 "Error while sharing" => "Nem sikerült létrehozni a megosztást",
 "Error while unsharing" => "Nem sikerült visszavonni a megosztást",
 "Error while changing permissions" => "Nem sikerült módosítani a jogosultságokat",
@@ -104,6 +93,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Küldés ...",
 "Email sent" => "Az emailt elküldtük",
 "Warning" => "Figyelmeztetés",
+"The object type is not specified." => "Az objektum típusa nincs megadva.",
+"Delete" => "Törlés",
+"Add" => "Hozzáadás",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A frissítés nem sikerült. Kérem értesítse erről a problémáról az <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud közösséget</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.",
 "%s password reset" => "%s jelszó visszaállítás",
@@ -126,8 +118,6 @@ $TRANSLATIONS = array(
 "Help" => "Súgó",
 "Access forbidden" => "A hozzáférés nem engedélyezett",
 "Cloud not found" => "A felhő nem található",
-"Edit categories" => "Kategóriák szerkesztése",
-"Add" => "Hozzáadás",
 "Security Warning" => "Biztonsági figyelmeztetés",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Az Ön PHP verziója sebezhető a NULL bájtos támadással szemben (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Kérjük frissítse a telepített PHP csomagjait, hogy biztonságos legyen az %s szolgáltatása.",
diff --git a/core/l10n/hy.php b/core/l10n/hy.php
index d2b68819c727d690a5c126b0a6b74ae696f67c16..29df048fd945fac15502846eea9cb09d239d02b6 100644
--- a/core/l10n/hy.php
+++ b/core/l10n/hy.php
@@ -23,6 +23,7 @@ $TRANSLATIONS = array(
 "_%n hour ago_::_%n hours ago_" => array("",""),
 "_%n day ago_::_%n days ago_" => array("",""),
 "_%n month ago_::_%n months ago_" => array("",""),
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Delete" => "Ջնջել"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index 48d2588c002fcc75397522e0c07136eda1cc4bf0..fce101939e43a2ec2d7ead80f4f7a3912d45ee06 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -26,10 +26,12 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Cancellar",
-"Error" => "Error",
 "Share" => "Compartir",
+"Error" => "Error",
 "Password" => "Contrasigno",
 "Send" => "Invia",
+"Delete" => "Deler",
+"Add" => "Adder",
 "Username" => "Nomine de usator",
 "Request reset" => "Requestar reinitialisation",
 "Your password was reset" => "Tu contrasigno esseva reinitialisate",
@@ -43,8 +45,6 @@ $TRANSLATIONS = array(
 "Help" => "Adjuta",
 "Access forbidden" => "Accesso prohibite",
 "Cloud not found" => "Nube non trovate",
-"Edit categories" => "Modificar categorias",
-"Add" => "Adder",
 "Create an <strong>admin account</strong>" => "Crear un <strong>conto de administration</strong>",
 "Advanced" => "Avantiate",
 "Data folder" => "Dossier de datos",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 2b987eecd84451a8c23fe067e8ba6248330aaa8a..d6ec5f0191d36b7d7d79d3f6953bd65a1fe7d8cc 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -1,14 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "group" => "grup",
-"Category type not provided." => "Tipe kategori tidak diberikan.",
-"No category to add?" => "Tidak ada kategori yang akan ditambahkan?",
-"This category already exists: %s" => "Kategori ini sudah ada: %s",
-"Object type not provided." => "Tipe objek tidak diberikan.",
-"%s ID not provided." => "ID %s tidak diberikan.",
-"Error adding %s to favorites." => "Galat ketika menambah %s ke favorit",
-"No categories selected for deletion." => "Tidak ada kategori terpilih untuk dihapus.",
-"Error removing %s from favorites." => "Galat ketika menghapus %s dari favorit",
 "Sunday" => "Minggu",
 "Monday" => "Senin",
 "Tuesday" => "Selasa",
@@ -46,12 +38,9 @@ $TRANSLATIONS = array(
 "Ok" => "Oke",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
 "Cancel" => "Batal",
-"The object type is not specified." => "Tipe objek tidak ditentukan.",
-"Error" => "Galat",
-"The app name is not specified." => "Nama aplikasi tidak ditentukan.",
-"The required file {file} is not installed!" => "Berkas {file} yang dibutuhkan tidak terpasang!",
 "Shared" => "Dibagikan",
 "Share" => "Bagikan",
+"Error" => "Galat",
 "Error while sharing" => "Galat ketika membagikan",
 "Error while unsharing" => "Galat ketika membatalkan pembagian",
 "Error while changing permissions" => "Galat ketika mengubah izin",
@@ -82,6 +71,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Mengirim ...",
 "Email sent" => "Email terkirim",
 "Warning" => "Peringatan",
+"The object type is not specified." => "Tipe objek tidak ditentukan.",
+"Delete" => "Hapus",
+"Add" => "Tambah",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Pembaruan gagal. Silakan laporkan masalah ini ke <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitas ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud.",
 "Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}",
@@ -99,8 +91,6 @@ $TRANSLATIONS = array(
 "Help" => "Bantuan",
 "Access forbidden" => "Akses ditolak",
 "Cloud not found" => "Cloud tidak ditemukan",
-"Edit categories" => "Edit kategori",
-"Add" => "Tambah",
 "Security Warning" => "Peringatan Keamanan",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versi PHP Anda rentan terhadap serangan NULL Byte (CVE-2006-7243)",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Generator acak yang aman tidak tersedia, silakan aktifkan ekstensi OpenSSL pada PHP.",
diff --git a/core/l10n/is.php b/core/l10n/is.php
index f72b7290b8f31d50d49107452880148624d3a8a8..0de5568aa1e07c319a64797a820724244398aa9b 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -1,12 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Category type not provided." => "Flokkur ekki gefin",
-"No category to add?" => "Enginn flokkur til að bæta við?",
-"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.",
-"No categories selected for deletion." => "Enginn flokkur valinn til eyðingar.",
-"Error removing %s from favorites." => "Villa við að fjarlægja %s úr eftirlæti.",
 "Sunday" => "Sunnudagur",
 "Monday" => "Mánudagur",
 "Tuesday" => "Þriðjudagur",
@@ -44,12 +37,9 @@ $TRANSLATIONS = array(
 "Ok" => "Í lagi",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Hætta við",
-"The object type is not specified." => "Tegund ekki tilgreind",
-"Error" => "Villa",
-"The app name is not specified." => "Nafn forrits ekki tilgreint",
-"The required file {file} is not installed!" => "Umbeðina skráin {file} ekki tiltæk!",
 "Shared" => "Deilt",
 "Share" => "Deila",
+"Error" => "Villa",
 "Error while sharing" => "Villa við deilingu",
 "Error while unsharing" => "Villa við að hætta deilingu",
 "Error while changing permissions" => "Villa við að breyta aðgangsheimildum",
@@ -80,6 +70,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Sendi ...",
 "Email sent" => "Tölvupóstur sendur",
 "Warning" => "Aðvörun",
+"The object type is not specified." => "Tegund ekki tilgreind",
+"Delete" => "Eyða",
+"Add" => "Bæta við",
 "The update was successful. Redirecting you to ownCloud now." => "Uppfærslan heppnaðist. Beini þér til ownCloud nú.",
 "Use the following link to reset your password: {link}" => "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}",
 "You will receive a link to reset your password via Email." => "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið.",
@@ -96,8 +89,6 @@ $TRANSLATIONS = array(
 "Help" => "Hjálp",
 "Access forbidden" => "Aðgangur bannaður",
 "Cloud not found" => "Ský finnst ekki",
-"Edit categories" => "Breyta flokkum",
-"Add" => "Bæta við",
 "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.",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 0b2d3768b0c8a386f5af1d905a901120dfb5f82e..1cb1a39c743648bf00362f7f4119663bd7e6f366 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -9,14 +9,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "Aggiornamento della cache dei file in corso, potrebbe richiedere molto tempo...",
 "Updated filecache" => "Cache dei file aggiornata",
 "... %d%% done ..." => "... %d%% completato ...",
-"Category type not provided." => "Tipo di categoria non fornito.",
-"No category to add?" => "Nessuna categoria da aggiungere?",
-"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.",
-"No categories selected for deletion." => "Nessuna categoria selezionata per l'eliminazione.",
-"Error removing %s from favorites." => "Errore durante la rimozione di %s dai preferiti.",
 "No image or file provided" => "Non è stata fornita alcun immagine o file",
 "Unknown filetype" => "Tipo di file sconosciuto",
 "Invalid image" => "Immagine non valida",
@@ -68,12 +60,9 @@ $TRANSLATIONS = array(
 "(all selected)" => "(tutti i selezionati)",
 "({count} selected)" => "({count} selezionati)",
 "Error loading file exists template" => "Errore durante il caricamento del modello del file esistente",
-"The object type is not specified." => "Il tipo di oggetto non è specificato.",
-"Error" => "Errore",
-"The app name is not specified." => "Il nome dell'applicazione non è specificato.",
-"The required file {file} is not installed!" => "Il file richiesto {file} non è installato!",
 "Shared" => "Condivisi",
 "Share" => "Condividi",
+"Error" => "Errore",
 "Error while sharing" => "Errore durante la condivisione",
 "Error while unsharing" => "Errore durante la rimozione della condivisione",
 "Error while changing permissions" => "Errore durante la modifica dei permessi",
@@ -106,6 +95,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Invio in corso...",
 "Email sent" => "Messaggio inviato",
 "Warning" => "Avviso",
+"The object type is not specified." => "Il tipo di oggetto non è specificato.",
+"Delete" => "Elimina",
+"Add" => "Aggiungi",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'aggiornamento non è riuscito. Segnala il problema alla <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunità di ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.",
 "%s password reset" => "Ripristino password di %s",
@@ -131,8 +123,6 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ciao,\n\nvolevo informarti che %s ha condiviso %s con te.\nVedi: %s\n\n",
 "The share will expire on %s.\n\n" => "La condivisione scadrà il %s.\n\n",
 "Cheers!" => "Saluti!",
-"Edit categories" => "Modifica categorie",
-"Add" => "Aggiungi",
 "Security Warning" => "Avviso di sicurezza",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La tua versione di PHP è vulnerabile all'attacco NULL Byte (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Aggiorna la tua installazione di PHP per utilizzare %s in sicurezza.",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index bf8313f7176c616ad6853f1133c12080495d13ae..00587e8530183125e2e9eb8cb6693141916460ac 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -8,14 +8,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "ファイルキャッシュを更新しています、しばらく掛かる恐れがあります...",
 "Updated filecache" => "ファイルキャッシュ更新完了",
 "... %d%% done ..." => "... %d%% 完了 ...",
-"Category type not provided." => "カテゴリタイプは提供されていません。",
-"No category to add?" => "追加するカテゴリはありませんか?",
-"This category already exists: %s" => "このカテゴリはすでに存在します: %s",
-"Object type not provided." => "オブジェクトタイプは提供されていません。",
-"%s ID not provided." => "%s ID は提供されていません。",
-"Error adding %s to favorites." => "お気に入りに %s を追加エラー",
-"No categories selected for deletion." => "削除するカテゴリが選択されていません。",
-"Error removing %s from favorites." => "お気に入りから %s の削除エラー",
 "No image or file provided" => "画像もしくはファイルが提供されていません",
 "Unknown filetype" => "不明なファイルタイプ",
 "Invalid image" => "無効な画像",
@@ -67,12 +59,9 @@ $TRANSLATIONS = array(
 "(all selected)" => "(全て選択)",
 "({count} selected)" => "({count} 選択)",
 "Error loading file exists template" => "既存ファイルのテンプレートの読み込みエラー",
-"The object type is not specified." => "オブジェクタイプが指定されていません。",
-"Error" => "エラー",
-"The app name is not specified." => "アプリ名がしていされていません。",
-"The required file {file} is not installed!" => "必要なファイル {file} がインストールされていません!",
 "Shared" => "共有中",
 "Share" => "共有",
+"Error" => "エラー",
 "Error while sharing" => "共有でエラー発生",
 "Error while unsharing" => "共有解除でエラー発生",
 "Error while changing permissions" => "権限変更でエラー発生",
@@ -104,6 +93,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "送信中...",
 "Email sent" => "メールを送信しました",
 "Warning" => "警告",
+"The object type is not specified." => "オブジェクタイプが指定されていません。",
+"Delete" => "削除",
+"Add" => "追加",
 "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 community</a> にレポートしてください。",
 "The update was successful. Redirecting you to ownCloud now." => "更新に成功しました。今すぐownCloudにリダイレクトします。",
 "%s password reset" => "%s パスワードリセット",
@@ -126,8 +118,6 @@ $TRANSLATIONS = array(
 "Help" => "ヘルプ",
 "Access forbidden" => "アクセスが禁止されています",
 "Cloud not found" => "見つかりません",
-"Edit categories" => "カテゴリを編集",
-"Add" => "追加",
 "Security Warning" => "セキュリティ警告",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "あなたのPHPのバージョンには、Null Byte攻撃(CVE-2006-7243)という脆弱性が含まれています。",
 "Please update your PHP installation to use %s securely." => "%s を安全に利用する為に インストールされているPHPをアップデートしてください。",
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index a32960e1a239f03d60784aaab6cf53fbc272010b..4e38aeede134142ddbbd45dc67555eee97d65094 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -1,14 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "group" => "ჯგუფი",
-"Category type not provided." => "კატეგორიის ტიპი არ არის განხილული.",
-"No category to add?" => "არ არის კატეგორია დასამატებლად?",
-"This category already exists: %s" => "კატეგორია უკვე არსებობს: %s",
-"Object type not provided." => "ობიექტის ტიპი არ არის განხილული.",
-"%s ID not provided." => "%s ID არ არის განხილული",
-"Error adding %s to favorites." => "შეცდომა %s–ის ფევორიტებში დამატების დროს.",
-"No categories selected for deletion." => "სარედაქტირებელი კატეგორია არ არის არჩეული ",
-"Error removing %s from favorites." => "შეცდომა  %s–ის ფევორიტებიდან წაშლის დროს.",
 "Sunday" => "კვირა",
 "Monday" => "ორშაბათი",
 "Tuesday" => "სამშაბათი",
@@ -46,12 +38,9 @@ $TRANSLATIONS = array(
 "Ok" => "დიახ",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
 "Cancel" => "უარყოფა",
-"The object type is not specified." => "ობიექტის ტიპი არ არის მითითებული.",
-"Error" => "შეცდომა",
-"The app name is not specified." => "აპლიკაციის სახელი არ არის მითითებული.",
-"The required file {file} is not installed!" => "მოთხოვნილი ფაილი  {file} არ არის დაინსტალირებული.",
 "Shared" => "გაზიარებული",
 "Share" => "გაზიარება",
+"Error" => "შეცდომა",
 "Error while sharing" => "შეცდომა გაზიარების დროს",
 "Error while unsharing" => "შეცდომა გაზიარების გაუქმების დროს",
 "Error while changing permissions" => "შეცდომა დაშვების ცვლილების დროს",
@@ -82,6 +71,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "გაგზავნა ....",
 "Email sent" => "იმეილი გაიგზავნა",
 "Warning" => "გაფრთხილება",
+"The object type is not specified." => "ობიექტის ტიპი არ არის მითითებული.",
+"Delete" => "წაშლა",
+"Add" => "დამატება",
 "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 community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე.",
 "Use the following link to reset your password: {link}" => "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}",
@@ -99,8 +91,6 @@ $TRANSLATIONS = array(
 "Help" => "დახმარება",
 "Access forbidden" => "წვდომა აკრძალულია",
 "Cloud not found" => "ღრუბელი არ არსებობს",
-"Edit categories" => "კატეგორიების რედაქტირება",
-"Add" => "დამატება",
 "Security Warning" => "უსაფრთხოების გაფრთხილება",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "თქვენი PHP ვერსია შეიცავს საფრთხეს  NULL Byte შეტევებისთვის (CVE-2006-7243)",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "შემთხვევითი სიმბოლოების გენერატორი არ არსებობს, გთხოვთ ჩართოთ PHP OpenSSL გაფართოება.",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 92c7b96f01ccc7c7bada0c84a37ffe38e2e21afb..9eccf12d089cd56bfc5d4526b7f103dec1c84dac 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -1,14 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "group" => "그룹",
-"Category type not provided." => "분류 형식이 제공되지 않았습니다.",
-"No category to add?" => "추가할 분류가 없습니까?",
-"This category already exists: %s" => "분류가 이미 존재합니다: %s",
-"Object type not provided." => "객체 형식이 제공되지 않았습니다.",
-"%s ID not provided." => "%s ID가 제공되지 않았습니다.",
-"Error adding %s to favorites." => "책갈피에 %s을(를) 추가할 수 없었습니다.",
-"No categories selected for deletion." => "삭제할 분류를 선택하지 않았습니다. ",
-"Error removing %s from favorites." => "책갈피에서 %s을(를) 삭제할 수 없었습니다.",
 "Sunday" => "일요일",
 "Monday" => "월요일",
 "Tuesday" => "화요일",
@@ -46,12 +38,9 @@ $TRANSLATIONS = array(
 "Ok" => "승락",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
 "Cancel" => "취소",
-"The object type is not specified." => "객체 유형이 지정되지 않았습니다.",
-"Error" => "오류",
-"The app name is not specified." => "앱 이름이 지정되지 않았습니다.",
-"The required file {file} is not installed!" => "필요한 파일 {file}이(가) 설치되지 않았습니다!",
 "Shared" => "공유됨",
 "Share" => "공유",
+"Error" => "오류",
 "Error while sharing" => "공유하는 중 오류 발생",
 "Error while unsharing" => "공유 해제하는 중 오류 발생",
 "Error while changing permissions" => "권한 변경하는 중 오류 발생",
@@ -83,6 +72,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "전송 중...",
 "Email sent" => "이메일 발송됨",
 "Warning" => "경고",
+"The object type is not specified." => "객체 유형이 지정되지 않았습니다.",
+"Delete" => "삭제",
+"Add" => "추가",
 "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로 돌아갑니다.",
 "Use the following link to reset your password: {link}" => "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}",
@@ -102,8 +94,6 @@ $TRANSLATIONS = array(
 "Help" => "도움말",
 "Access forbidden" => "접근 금지됨",
 "Cloud not found" => "클라우드를 찾을 수 없습니다",
-"Edit categories" => "분류 수정",
-"Add" => "추가",
 "Security Warning" => "보안 경고",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "사용 중인 PHP 버전이 NULL 바이트 공격에 취약합니다 (CVE-2006-7243)",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "안전한 난수 생성기를 사용할 수 없습니다. PHP의 OpenSSL 확장을 활성화해 주십시오.",
diff --git a/core/l10n/ku_IQ.php b/core/l10n/ku_IQ.php
index e11cf0b5a9648234c26b18e2ca15c7800c8928b8..b809c6431739491c8dced9ea2b5af892a4ceead3 100644
--- a/core/l10n/ku_IQ.php
+++ b/core/l10n/ku_IQ.php
@@ -6,10 +6,11 @@ $TRANSLATIONS = array(
 "_%n day ago_::_%n days ago_" => array("",""),
 "_%n month ago_::_%n months ago_" => array("",""),
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Error" => "هه‌ڵه",
 "Share" => "هاوبەشی کردن",
+"Error" => "هه‌ڵه",
 "Password" => "وشەی تێپەربو",
 "Warning" => "ئاگاداری",
+"Add" => "زیادکردن",
 "Username" => "ناوی به‌کارهێنه‌ر",
 "New password" => "وشەی نهێنی نوێ",
 "Reset password" => "دووباره‌ كردنه‌وه‌ی وشه‌ی نهێنی",
@@ -18,7 +19,6 @@ $TRANSLATIONS = array(
 "Admin" => "به‌ڕێوه‌به‌ری سه‌ره‌كی",
 "Help" => "یارمەتی",
 "Cloud not found" => "هیچ نه‌دۆزرایه‌وه‌",
-"Add" => "زیادکردن",
 "Advanced" => "هه‌ڵبژاردنی پیشكه‌وتوو",
 "Data folder" => "زانیاری فۆڵده‌ر",
 "Database user" => "به‌كارهێنه‌ری داتابه‌یس",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 17e4345ad518a1c98a7593fb858a84e9d0d79b77..faebdda63d3db72874ba2361f44ed7613cc9f6d1 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -2,14 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "Den/D' %s huet »%s« mat dir gedeelt",
 "group" => "Grupp",
-"Category type not provided." => "Typ vun der Kategorie net uginn.",
-"No category to add?" => "Keng Kategorie fir bäizesetzen?",
-"This category already exists: %s" => "Dës Kategorie existéiert schon: %s",
-"Object type not provided." => "Typ vum Objet net uginn.",
-"%s ID not provided." => "%s ID net uginn.",
-"Error adding %s to favorites." => "Feeler beim dobäisetze vun %s bei d'Favoritten.",
-"No categories selected for deletion." => "Keng Kategorien ausgewielt fir ze läschen.",
-"Error removing %s from favorites." => "Feeler beim läsche vun %s aus de Favoritten.",
 "Sunday" => "Sonndeg",
 "Monday" => "Méindeg",
 "Tuesday" => "Dënschdeg",
@@ -47,12 +39,9 @@ $TRANSLATIONS = array(
 "Ok" => "OK",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Ofbriechen",
-"The object type is not specified." => "Den Typ vum Object ass net uginn.",
-"Error" => "Feeler",
-"The app name is not specified." => "Den Numm vun der App ass net uginn.",
-"The required file {file} is not installed!" => "De benéidegte Fichier {file} ass net installéiert!",
 "Shared" => "Gedeelt",
 "Share" => "Deelen",
+"Error" => "Feeler",
 "Error while sharing" => "Feeler beim Deelen",
 "Error while unsharing" => "Feeler beim Annuléiere vum Deelen",
 "Error while changing permissions" => "Feeler beim Ännere vun de Rechter",
@@ -84,6 +73,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Gëtt geschéckt...",
 "Email sent" => "Email geschéckt",
 "Warning" => "Warnung",
+"The object type is not specified." => "Den Typ vum Object ass net uginn.",
+"Delete" => "Läschen",
+"Add" => "Dobäisetzen",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Den Update war net erfollegräich. Mell dëse Problem w.e.gl der<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-Community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Den Update war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet.",
 "Use the following link to reset your password: {link}" => "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}",
@@ -105,8 +97,6 @@ $TRANSLATIONS = array(
 "Help" => "Hëllef",
 "Access forbidden" => "Zougrëff net erlaabt",
 "Cloud not found" => "Cloud net fonnt",
-"Edit categories" => "Kategorien editéieren",
-"Add" => "Dobäisetzen",
 "Security Warning" => "Sécherheets-Warnung",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Deng PHP-Versioun ass verwonnbar duerch d'NULL-Byte-Attack (CVE-2006-7243)",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Et ass kee sécheren Zoufallsgenerator verfügbar. Aktivéier w.e.gl d'OpenSSL-Erweiderung vu PHP.",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 7d3ce9bec6ff8620ff177d049b9dacec1e2478b7..81e3be95e0fbf4245d4aeff6eb0735746dcb244c 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -9,14 +9,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "Atnaujinama failų talpykla, tai gali užtrukti labai ilgai...",
 "Updated filecache" => "Atnaujinta failų talpykla",
 "... %d%% done ..." => "... %d%% atlikta ...",
-"Category type not provided." => "Kategorija nenurodyta.",
-"No category to add?" => "Nepridėsite jokios kategorijos?",
-"This category already exists: %s" => "Ši kategorija jau egzistuoja: %s",
-"Object type not provided." => "Objekto tipas nenurodytas.",
-"%s ID not provided." => "%s ID nenurodytas.",
-"Error adding %s to favorites." => "Klaida perkeliant %s į jūsų mėgstamiausius.",
-"No categories selected for deletion." => "Trynimui nepasirinkta jokia kategorija.",
-"Error removing %s from favorites." => "Klaida ištrinant %s iš jūsų mėgstamiausius.",
 "No image or file provided" => "Nenurodytas paveikslėlis ar failas",
 "Unknown filetype" => "Nežinomas failo tipas",
 "Invalid image" => "Netinkamas paveikslėlis",
@@ -68,12 +60,9 @@ $TRANSLATIONS = array(
 "(all selected)" => "(visi pažymėti)",
 "({count} selected)" => "({count} pažymėtų)",
 "Error loading file exists template" => "Klaida įkeliant esančių failų ruošinį",
-"The object type is not specified." => "Objekto tipas nenurodytas.",
-"Error" => "Klaida",
-"The app name is not specified." => "Nenurodytas programos pavadinimas.",
-"The required file {file} is not installed!" => "Reikalingas {file} failas nėra įrašytas!",
 "Shared" => "Dalinamasi",
 "Share" => "Dalintis",
+"Error" => "Klaida",
 "Error while sharing" => "Klaida, dalijimosi metu",
 "Error while unsharing" => "Klaida, kai atšaukiamas dalijimasis",
 "Error while changing permissions" => "Klaida, keičiant privilegijas",
@@ -106,6 +95,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Siunčiama...",
 "Email sent" => "Laiškas išsiųstas",
 "Warning" => "Įspėjimas",
+"The object type is not specified." => "Objekto tipas nenurodytas.",
+"Delete" => "Ištrinti",
+"Add" => "Pridėti",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Atnaujinimas buvo nesėkmingas. PApie tai prašome pranešti the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud bendruomenei</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.",
 "%s password reset" => "%s slaptažodžio atnaujinimas",
@@ -128,10 +120,9 @@ $TRANSLATIONS = array(
 "Help" => "Pagalba",
 "Access forbidden" => "Priėjimas draudžiamas",
 "Cloud not found" => "Negalima rasti",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Labas,\n\nInformuojame, kad %s pasidalino su Jumis %s.\nPažiūrėti tai: %s\n",
 "The share will expire on %s.\n\n" => "Bendrinimo laikas baigsis %s.\n",
 "Cheers!" => "Sveikinimai!",
-"Edit categories" => "Redaguoti kategorijas",
-"Add" => "Pridėti",
 "Security Warning" => "Saugumo pranešimas",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Jūsų PHP versija yra pažeidžiama prieš NULL Byte ataką (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Prašome atnaujinti savo PHP, kad saugiai naudoti %s.",
@@ -160,6 +151,7 @@ $TRANSLATIONS = array(
 "remember" => "prisiminti",
 "Log in" => "Prisijungti",
 "Alternative Logins" => "Alternatyvūs prisijungimai",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Labas,<br><br>tik informuojame, kad %s pasidalino su Jumis »%s«.<br><a href=\"%s\">Peržiūrėk!</a><br><br>",
 "The share will expire on %s.<br><br>" => "Bendrinimo laikas baigsis %s.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Atnaujinama ownCloud į %s versiją. tai gali šiek tiek užtrukti."
 );
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 998a03c5dd120696a9489d06cca6ce862147c893..647ad2bca3fa4f0d1a6c0a876a8626ee7a94e3ea 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -2,14 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s kopīgots »%s« ar jums",
 "group" => "grupa",
-"Category type not provided." => "Kategorijas tips nav norādīts.",
-"No category to add?" => "Nav kategoriju, ko pievienot?",
-"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.",
-"No categories selected for deletion." => "Neviena kategorija nav izvēlēta dzēšanai.",
-"Error removing %s from favorites." => "Kļūda, izņemot %s no izlases.",
 "Sunday" => "Svētdiena",
 "Monday" => "Pirmdiena",
 "Tuesday" => "Otrdiena",
@@ -47,12 +39,9 @@ $TRANSLATIONS = array(
 "Ok" => "Labi",
 "_{count} file conflict_::_{count} file conflicts_" => array("","",""),
 "Cancel" => "Atcelt",
-"The object type is not specified." => "Nav norādīts objekta tips.",
-"Error" => "Kļūda",
-"The app name is not specified." => "Nav norādīts lietotnes nosaukums.",
-"The required file {file} is not installed!" => "Pieprasītā datne {file} nav instalēta!",
 "Shared" => "Kopīgs",
 "Share" => "Dalīties",
+"Error" => "Kļūda",
 "Error while sharing" => "Kļūda, daloties",
 "Error while unsharing" => "Kļūda, beidzot dalīties",
 "Error while changing permissions" => "Kļūda, mainot atļaujas",
@@ -84,6 +73,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Sūta...",
 "Email sent" => "Vēstule nosūtīta",
 "Warning" => "Brīdinājums",
+"The object type is not specified." => "Nav norādīts objekta tips.",
+"Delete" => "Dzēst",
+"Add" => "Pievienot",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Atjaunināšana beidzās nesekmīgi. Lūdzu, ziņojiet par šo problēmu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kopienai</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud.",
 "%s password reset" => "%s paroles maiņa",
@@ -106,8 +98,6 @@ $TRANSLATIONS = array(
 "Help" => "Palīdzība",
 "Access forbidden" => "Pieeja ir liegta",
 "Cloud not found" => "Mākonis netika atrasts",
-"Edit categories" => "Rediģēt kategoriju",
-"Add" => "Pievienot",
 "Security Warning" => "Brīdinājums par drošību",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Jūsu PHP ir ievainojamība pret NULL Byte uzbrukumiem (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Lūdzu atjauniniet PHP instalāciju lai varētu droši izmantot %s.",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index dffd20ab3bba2fb109e0dbc70b4d2d2708658193..35815d145b518249dbc2df334b24b05622905dc4 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -1,13 +1,9 @@
 <?php
 $TRANSLATIONS = array(
 "group" => "група",
-"Category type not provided." => "Не беше доставен тип на категорија.",
-"No category to add?" => "Нема категорија да се додаде?",
-"Object type not provided." => "Не беше доставен тип на објект.",
-"%s ID not provided." => "%s ID не беше доставено.",
-"Error adding %s to favorites." => "Грешка при додавање %s во омилени.",
-"No categories selected for deletion." => "Не е одбрана категорија за бришење.",
-"Error removing %s from favorites." => "Грешка при бришење на %s од омилени.",
+"Updated database" => "Базата е надградена",
+"Updated filecache" => "Кешот е надграден",
+"Invalid image" => "Невалидна фотографија",
 "Sunday" => "Недела",
 "Monday" => "Понеделник",
 "Tuesday" => "Вторник",
@@ -45,11 +41,13 @@ $TRANSLATIONS = array(
 "Ok" => "Во ред",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Откажи",
-"The object type is not specified." => "Не е специфициран типот на објект.",
-"Error" => "Грешка",
-"The app name is not specified." => "Името на апликацијата не е специфицирано.",
-"The required file {file} is not installed!" => "Задолжителната датотека {file} не е инсталирана!",
+"Continue" => "Продолжи",
+"(all selected)" => "(сите одбрани)",
+"({count} selected)" => "({count} одбраните)",
+"Error loading file exists template" => "Грешка при вчитување на датотеката, шаблонот постои ",
+"Shared" => "Споделен",
 "Share" => "Сподели",
+"Error" => "Грешка",
 "Error while sharing" => "Грешка при споделување",
 "Error while unsharing" => "Грешка при прекин на споделување",
 "Error while changing permissions" => "Грешка при промена на привилегии",
@@ -59,6 +57,7 @@ $TRANSLATIONS = array(
 "Share with link" => "Сподели со врска",
 "Password protect" => "Заштити со лозинка",
 "Password" => "Лозинка",
+"Allow Public Upload" => "Дозволи јавен аплоуд",
 "Email link to person" => "Прати врска по е-пошта на личност",
 "Send" => "Прати",
 "Set expiration date" => "Постави рок на траење",
@@ -68,6 +67,7 @@ $TRANSLATIONS = array(
 "Resharing is not allowed" => "Повторно споделување не е дозволено",
 "Shared in {item} with {user}" => "Споделено во {item} со {user}",
 "Unshare" => "Не споделувај",
+"notify user by email" => "извести го корисникот преку електронска пошта",
 "can edit" => "може да се измени",
 "access control" => "контрола на пристап",
 "create" => "креирај",
@@ -80,9 +80,16 @@ $TRANSLATIONS = array(
 "Sending ..." => "Праќање...",
 "Email sent" => "Е-порака пратена",
 "Warning" => "Предупредување",
+"The object type is not specified." => "Не е специфициран типот на објект.",
+"Delete" => "Избриши",
+"Add" => "Додади",
+"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 community</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud.",
+"%s password reset" => "%s ресетирање на лозинката",
 "Use the following link to reset your password: {link}" => "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
 "You will receive a link to reset your password via Email." => "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
 "Username" => "Корисничко име",
+"Yes, I really want to reset my password now" => "Да, јас сега навистина сакам да ја поништам својата лозинка",
 "Request reset" => "Побарајте ресетирање",
 "Your password was reset" => "Вашата лозинка беше ресетирана",
 "To login page" => "Кон страницата за најава",
@@ -95,11 +102,14 @@ $TRANSLATIONS = array(
 "Help" => "Помош",
 "Access forbidden" => "Забранет пристап",
 "Cloud not found" => "Облакот не е најден",
-"Edit categories" => "Уреди категории",
-"Add" => "Додади",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Здраво,\n\nСамо да ве известам дека  %s shared %s with you.\nView it: %s\n\n",
+"The share will expire on %s.\n\n" => "Споделувањето ќе заврши на %s.\n\n",
+"Cheers!" => "Поздрав!",
 "Security Warning" => "Безбедносно предупредување",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Вашата верзија на PHP е ранлива на NULL Byte attack (CVE-2006-7243)",
 "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 files are probably accessible from the internet because the .htaccess file does not work." => "Вашиот директориум со податоци и датотеки се веројатно достапни преку интенернт поради што .htaccess датотеката не функционира.",
 "Create an <strong>admin account</strong>" => "Направете <strong>администраторска сметка</strong>",
 "Advanced" => "Напредно",
 "Data folder" => "Фолдер со податоци",
@@ -111,12 +121,16 @@ $TRANSLATIONS = array(
 "Database tablespace" => "Табела во базата на податоци",
 "Database host" => "Сервер со база",
 "Finish setup" => "Заврши го подесувањето",
+"Finishing …" => "Завршувам ...",
 "Log out" => "Одјава",
 "Automatic logon rejected!" => "Одбиена автоматска најава!",
 "If you did not change your password recently, your account may be compromised!" => "Ако не сте ја промениле лозинката во скоро време, вашата сметка може да е компромитирана",
 "Please change your password to secure your account again." => "Ве молам сменете ја лозинката да ја обезбедите вашата сметка повторно.",
+"Please contact your administrator." => "Ве молиме контактирајте го вашиот администратор.",
 "Lost your password?" => "Ја заборавивте лозинката?",
 "remember" => "запамти",
-"Log in" => "Најава"
+"Log in" => "Најава",
+"Alternative Logins" => "Алтернативни најавувања",
+"Updating ownCloud to version %s, this may take a while." => "Надградбата на ownCloud на верзијата %s, може да потрае."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index cac2dbff2a24bd56b68b53966a6f2847b38294ed..9d30010e6ceba2a122de91bf40b69ad65783559d 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -1,7 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"No category to add?" => "Tiada kategori untuk di tambah?",
-"No categories selected for deletion." => "Tiada kategori dipilih untuk dibuang.",
 "Sunday" => "Ahad",
 "Monday" => "Isnin",
 "Tuesday" => "Selasa",
@@ -31,10 +29,12 @@ $TRANSLATIONS = array(
 "Ok" => "Ok",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
 "Cancel" => "Batal",
-"Error" => "Ralat",
 "Share" => "Kongsi",
+"Error" => "Ralat",
 "Password" => "Kata laluan",
 "Warning" => "Amaran",
+"Delete" => "Padam",
+"Add" => "Tambah",
 "Use the following link to reset your password: {link}" => "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}",
 "You will receive a link to reset your password via Email." => "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel",
 "Username" => "Nama pengguna",
@@ -50,8 +50,6 @@ $TRANSLATIONS = array(
 "Help" => "Bantuan",
 "Access forbidden" => "Larangan akses",
 "Cloud not found" => "Awan tidak dijumpai",
-"Edit categories" => "Ubah kategori",
-"Add" => "Tambah",
 "Security Warning" => "Amaran keselamatan",
 "Create an <strong>admin account</strong>" => "buat <strong>akaun admin</strong>",
 "Advanced" => "Maju",
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
index 0a07d151185c28b16952c92a3fbd2f218fc5dc4f..464e52d6d152c4ef1895b09acc71f113e94930f8 100644
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@@ -1,7 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"No category to add?" => "ထည့်ရန်ခေါင်းစဉ်မရှိဘူးလား",
-"No categories selected for deletion." => "ဖျက်ရန်အတွက်ခေါင်းစဉ်မရွေးထားပါ",
 "January" => "ဇန်နဝါရီ",
 "February" => "ဖေဖော်ဝါရီ",
 "March" => "မတ်",
@@ -40,6 +38,7 @@ $TRANSLATIONS = array(
 "delete" => "ဖျက်မည်",
 "share" => "ဝေမျှမည်",
 "Password protected" => "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်",
+"Add" => "ပေါင်းထည့်",
 "You will receive a link to reset your password via Email." => "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။",
 "Username" => "သုံးစွဲသူအမည်",
 "Your password was reset" => "သင်၏စကားဝှက်ကိုပြန်ဖော်ပြီးပါပြီ။",
@@ -50,7 +49,6 @@ $TRANSLATIONS = array(
 "Admin" => "အက်ဒမင်",
 "Help" => "အကူအညီ",
 "Cloud not found" => "မတွေ့ရှိမိပါ",
-"Add" => "ပေါင်းထည့်",
 "Security Warning" => "လုံခြုံရေးသတိပေးချက်",
 "Create an <strong>admin account</strong>" => "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်",
 "Advanced" => "အဆင့်မြင့်",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index a252642678a3204fbacda77bb77459c519ad530c..7240b8f318a4d2d79514345e910b6333491c0831 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -2,9 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s delte »%s« med deg",
 "group" => "gruppe",
-"No category to add?" => "Ingen kategorier å legge til?",
-"This category already exists: %s" => "Denne kategorien finnes allerede: %s",
-"No categories selected for deletion." => "Ingen kategorier merket for sletting.",
 "Sunday" => "Søndag",
 "Monday" => "Mandag",
 "Tuesday" => "Tirsdag",
@@ -42,9 +39,9 @@ $TRANSLATIONS = array(
 "Ok" => "Ok",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Avbryt",
-"Error" => "Feil",
 "Shared" => "Delt",
 "Share" => "Del",
+"Error" => "Feil",
 "Error while sharing" => "Feil under deling",
 "Shared with you by {owner}" => "Delt med deg av {owner}",
 "Share with" => "Del med",
@@ -68,6 +65,8 @@ $TRANSLATIONS = array(
 "Sending ..." => "Sender...",
 "Email sent" => "E-post sendt",
 "Warning" => "Advarsel",
+"Delete" => "Slett",
+"Add" => "Legg til",
 "Use the following link to reset your password: {link}" => "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
 "You will receive a link to reset your password via Email." => "Du burde motta detaljer om å tilbakestille passordet ditt via epost.",
 "Username" => "Brukernavn",
@@ -83,8 +82,6 @@ $TRANSLATIONS = array(
 "Help" => "Hjelp",
 "Access forbidden" => "Tilgang nektet",
 "Cloud not found" => "Sky ikke funnet",
-"Edit categories" => "Rediger kategorier",
-"Add" => "Legg til",
 "Security Warning" => "Sikkerhetsadvarsel",
 "Create an <strong>admin account</strong>" => "opprett en <strong>administrator-konto</strong>",
 "Advanced" => "Avansert",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index fe8ec482e3b6c270d8b4c41bfdfdcb46888c01b4..675471f88e0e213aef3b6f7a1d6505679620edf8 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s deelde »%s« met jou",
+"Couldn't send mail to following users: %s " => "Kon geen e-mail sturen aan de volgende gebruikers: %s",
 "group" => "groep",
 "Turned on maintenance mode" => "Onderhoudsmodus ingeschakeld",
 "Turned off maintenance mode" => "Onderhoudsmodus uitgeschakeld",
@@ -8,14 +9,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "Bijwerken bestandscache. Dit kan even duren...",
 "Updated filecache" => "Bestandscache bijgewerkt",
 "... %d%% done ..." => "... %d%% gereed ...",
-"Category type not provided." => "Categorie type niet opgegeven.",
-"No category to add?" => "Geen categorie om toe te voegen?",
-"This category already exists: %s" => "Deze categorie bestaat al: %s",
-"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.",
-"No categories selected for deletion." => "Geen categorie geselecteerd voor verwijdering.",
-"Error removing %s from favorites." => "Verwijderen %s van favorieten is mislukt.",
 "No image or file provided" => "Geen afbeelding of bestand opgegeven",
 "Unknown filetype" => "Onbekend bestandsformaat",
 "Invalid image" => "Ongeldige afbeelding",
@@ -58,14 +51,18 @@ $TRANSLATIONS = array(
 "No" => "Nee",
 "Ok" => "Ok",
 "Error loading message template: {error}" => "Fout bij laden berichtensjabloon: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} bestandsconflict","{count} bestandsconflicten"),
+"One file conflict" => "Een bestandsconflict",
+"Which files do you want to keep?" => "Welke bestanden wilt u bewaren?",
+"If you select both versions, the copied file will have a number added to its name." => "Als u beide versies selecteerde, zal het gekopieerde bestand een nummer aan de naam toegevoegd krijgen.",
 "Cancel" => "Annuleer",
-"The object type is not specified." => "Het object type is niet gespecificeerd.",
-"Error" => "Fout",
-"The app name is not specified." => "De app naam is niet gespecificeerd.",
-"The required file {file} is not installed!" => "Het vereiste bestand {file} is niet geïnstalleerd!",
+"Continue" => "Verder",
+"(all selected)" => "(alles geselecteerd)",
+"({count} selected)" => "({count} geselecteerd)",
+"Error loading file exists template" => "Fout bij laden bestand bestaat al sjabloon",
 "Shared" => "Gedeeld",
 "Share" => "Delen",
+"Error" => "Fout",
 "Error while sharing" => "Fout tijdens het delen",
 "Error while unsharing" => "Fout tijdens het stoppen met delen",
 "Error while changing permissions" => "Fout tijdens het veranderen van permissies",
@@ -85,6 +82,7 @@ $TRANSLATIONS = array(
 "Resharing is not allowed" => "Verder delen is niet toegestaan",
 "Shared in {item} with {user}" => "Gedeeld in {item} met {user}",
 "Unshare" => "Stop met delen",
+"notify user by email" => "Gebruiker via e-mail notificeren",
 "can edit" => "kan wijzigen",
 "access control" => "toegangscontrole",
 "create" => "creëer",
@@ -97,6 +95,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Versturen ...",
 "Email sent" => "E-mail verzonden",
 "Warning" => "Waarschuwing",
+"The object type is not specified." => "Het object type is niet gespecificeerd.",
+"Delete" => "Verwijder",
+"Add" => "Toevoegen",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud.",
 "%s password reset" => "%s wachtwoord reset",
@@ -119,8 +120,9 @@ $TRANSLATIONS = array(
 "Help" => "Help",
 "Access forbidden" => "Toegang verboden",
 "Cloud not found" => "Cloud niet gevonden",
-"Edit categories" => "Wijzig categorieën",
-"Add" => "Toevoegen",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo daar,\n\neven een berichtje dat %s %s met u deelde.\nBekijk het: %s\n\n",
+"The share will expire on %s.\n\n" => "De Share vervalt op %s.\n\n\n\n",
+"Cheers!" => "Proficiat!",
 "Security Warning" => "Beveiligingswaarschuwing",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Je PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Werk uw PHP installatie bij om %s veilig te kunnen gebruiken.",
@@ -139,15 +141,20 @@ $TRANSLATIONS = array(
 "Database tablespace" => "Database tablespace",
 "Database host" => "Databaseserver",
 "Finish setup" => "Installatie afronden",
+"Finishing …" => "Afronden ...",
 "%s is available. Get more information on how to update." => "%s is beschikbaar. Verkrijg meer informatie over het bijwerken.",
 "Log out" => "Afmelden",
 "Automatic logon rejected!" => "Automatische aanmelding geweigerd!",
 "If you did not change your password recently, your account may be compromised!" => "Als je je wachtwoord niet onlangs heeft aangepast, kan je account overgenomen zijn!",
 "Please change your password to secure your account again." => "Wijzig je wachtwoord zodat je account weer beveiligd is.",
+"Server side authentication failed!" => "Authenticatie bij de server mislukte!",
+"Please contact your administrator." => "Neem contact op met uw systeembeheerder.",
 "Lost your password?" => "Wachtwoord vergeten?",
 "remember" => "onthoud gegevens",
 "Log in" => "Meld je aan",
 "Alternative Logins" => "Alternatieve inlogs",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hallo daar,<br><br>even een berichtje dat %s »%s« met u deelde.<br><a href=\"%s\">Bekijk hier!</a><br><br>",
+"The share will expire on %s.<br><br>" => "Het delen stopt op %s.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 6dff2e63742a26c12b5082c2cb22fe11e20311b1..3ac3a6ea6908c93c05cfb7c2a84c659dec1657ae 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -8,14 +8,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "Oppdaterer mellomlager; dette kan ta ei god stund …",
 "Updated filecache" => "Mellomlager oppdatert",
 "... %d%% done ..." => "… %d %% ferdig …",
-"Category type not provided." => "Ingen kategoritype.",
-"No category to add?" => "Ingen kategori å leggja til?",
-"This category already exists: %s" => "Denne kategorien finst alt: %s",
-"Object type not provided." => "Ingen objekttype.",
-"%s ID not provided." => "Ingen %s-ID.",
-"Error adding %s to favorites." => "Klarte ikkje leggja til %s i favorittar.",
-"No categories selected for deletion." => "Ingen kategoriar valt for sletting.",
-"Error removing %s from favorites." => "Klarte ikkje fjerna %s frå favorittar.",
 "No image or file provided" => "Inga bilete eller fil gitt",
 "Unknown filetype" => "Ukjend filtype",
 "Invalid image" => "Ugyldig bilete",
@@ -67,12 +59,9 @@ $TRANSLATIONS = array(
 "(all selected)" => "(alle valte)",
 "({count} selected)" => "({count} valte)",
 "Error loading file exists template" => "Klarte ikkje å lasta fil-finst-mal",
-"The object type is not specified." => "Objekttypen er ikkje spesifisert.",
-"Error" => "Feil",
-"The app name is not specified." => "Programnamnet er ikkje spesifisert.",
-"The required file {file} is not installed!" => "Den kravde fila {file} er ikkje installert!",
 "Shared" => "Delt",
 "Share" => "Del",
+"Error" => "Feil",
 "Error while sharing" => "Feil ved deling",
 "Error while unsharing" => "Feil ved udeling",
 "Error while changing permissions" => "Feil ved endring av tillatingar",
@@ -104,6 +93,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Sender …",
 "Email sent" => "E-post sendt",
 "Warning" => "Åtvaring",
+"The object type is not specified." => "Objekttypen er ikkje spesifisert.",
+"Delete" => "Slett",
+"Add" => "Legg til",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
 "%s password reset" => "%s passordnullstilling",
@@ -126,8 +118,6 @@ $TRANSLATIONS = array(
 "Help" => "Hjelp",
 "Access forbidden" => "Tilgang forbudt",
 "Cloud not found" => "Fann ikkje skyen",
-"Edit categories" => "Endra kategoriar",
-"Add" => "Legg til",
 "Security Warning" => "Tryggleiksåtvaring",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-utgåva di er sårbar for NULL-byteåtaket (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Ver venleg og oppdater PHP-installasjonen din til å brukar %s trygt.",
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index fd84d0b2e3079a8c627622861cb766822caca378..c6472b1c17dad67e689fce71e212f9468ad75190 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -1,8 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "group" => "grop",
-"No category to add?" => "Pas de categoria d'ajustar ?",
-"No categories selected for deletion." => "Pas de categorias seleccionadas per escafar.",
 "Sunday" => "Dimenge",
 "Monday" => "Diluns",
 "Tuesday" => "Dimarç",
@@ -40,8 +38,8 @@ $TRANSLATIONS = array(
 "Ok" => "D'accòrdi",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Annula",
-"Error" => "Error",
 "Share" => "Parteja",
+"Error" => "Error",
 "Error while sharing" => "Error al partejar",
 "Error while unsharing" => "Error al non partejar",
 "Error while changing permissions" => "Error al cambiar permissions",
@@ -64,6 +62,8 @@ $TRANSLATIONS = array(
 "Password protected" => "Parat per senhal",
 "Error unsetting expiration date" => "Error al metre de la data d'expiracion",
 "Error setting expiration date" => "Error setting expiration date",
+"Delete" => "Escafa",
+"Add" => "Ajusta",
 "Use the following link to reset your password: {link}" => "Utiliza lo ligam seguent per tornar botar lo senhal : {link}",
 "You will receive a link to reset your password via Email." => "Reçaupràs un ligam per tornar botar ton senhal via corrièl.",
 "Username" => "Non d'usancièr",
@@ -79,8 +79,6 @@ $TRANSLATIONS = array(
 "Help" => "Ajuda",
 "Access forbidden" => "Acces enebit",
 "Cloud not found" => "Nívol pas trobada",
-"Edit categories" => "Edita categorias",
-"Add" => "Ajusta",
 "Security Warning" => "Avertiment de securitat",
 "Create an <strong>admin account</strong>" => "Crea un <strong>compte admin</strong>",
 "Advanced" => "Avançat",
diff --git a/core/l10n/pa.php b/core/l10n/pa.php
index 156c6dbac145a41ca623c88a0df4e97c5d0079a8..b637c429a6eaa56bacd70ef3b7c8b4449bad7767 100644
--- a/core/l10n/pa.php
+++ b/core/l10n/pa.php
@@ -37,11 +37,12 @@ $TRANSLATIONS = array(
 "Ok" => "ਠੀਕ ਹੈ",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "ਰੱਦ ਕਰੋ",
-"Error" => "ਗਲ",
 "Share" => "ਸਾਂਝਾ ਕਰੋ",
+"Error" => "ਗਲ",
 "Password" => "ਪਾਸਵਰ",
 "Send" => "ਭੇਜੋ",
 "Warning" => "ਚੇਤਾਵਨੀ",
+"Delete" => "ਹਟਾਓ",
 "Username" => "ਯੂਜ਼ਰ-ਨਾਂ",
 "Security Warning" => "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ"
 );
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 5d60f5d3aa7e993dbed24f7adaadc5757d2ab82d..60476b5aad6fb143c2284366e5dfa4d48c9a1223 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -8,14 +8,7 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "Aktualizowanie filecache, to może potrwać bardzo długo...",
 "Updated filecache" => "Zaktualizuj filecache",
 "... %d%% done ..." => "... %d%% udane ...",
-"Category type not provided." => "Nie podano typu kategorii.",
-"No category to add?" => "Brak kategorii do dodania?",
-"This category already exists: %s" => "Ta kategoria już istnieje: %s",
-"Object type not provided." => "Nie podano typu obiektu.",
-"%s ID not provided." => "Nie podano ID %s.",
-"Error adding %s to favorites." => "Błąd podczas dodawania %s do ulubionych.",
-"No categories selected for deletion." => "Nie zaznaczono kategorii do usunięcia.",
-"Error removing %s from favorites." => "Błąd podczas usuwania %s z ulubionych.",
+"No image or file provided" => "Brak obrazu lub pliku dostarczonego",
 "Unknown filetype" => "Nieznany typ pliku",
 "Invalid image" => "Nieprawidłowe zdjęcie",
 "Sunday" => "Niedziela",
@@ -59,12 +52,9 @@ $TRANSLATIONS = array(
 "Continue" => "Kontynuuj ",
 "(all selected)" => "(wszystkie zaznaczone)",
 "({count} selected)" => "({count} zaznaczonych)",
-"The object type is not specified." => "Nie określono typu obiektu.",
-"Error" => "Błąd",
-"The app name is not specified." => "Nie określono nazwy aplikacji.",
-"The required file {file} is not installed!" => "Wymagany plik {file} nie jest zainstalowany!",
 "Shared" => "Udostępniono",
 "Share" => "Udostępnij",
+"Error" => "Błąd",
 "Error while sharing" => "Błąd podczas współdzielenia",
 "Error while unsharing" => "Błąd podczas zatrzymywania współdzielenia",
 "Error while changing permissions" => "Błąd przy zmianie uprawnień",
@@ -84,6 +74,7 @@ $TRANSLATIONS = array(
 "Resharing is not allowed" => "Współdzielenie nie jest możliwe",
 "Shared in {item} with {user}" => "Współdzielone w {item} z {user}",
 "Unshare" => "Zatrzymaj współdzielenie",
+"notify user by email" => "powiadom użytkownika przez email",
 "can edit" => "może edytować",
 "access control" => "kontrola dostępu",
 "create" => "utwórz",
@@ -96,6 +87,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Wysyłanie...",
 "Email sent" => "E-mail wysłany",
 "Warning" => "Ostrzeżenie",
+"The object type is not specified." => "Nie określono typu obiektu.",
+"Delete" => "Usuń",
+"Add" => "Dodaj",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">spoleczności ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
 "%s password reset" => "%s reset hasła",
@@ -118,8 +112,8 @@ $TRANSLATIONS = array(
 "Help" => "Pomoc",
 "Access forbidden" => "Dostęp zabroniony",
 "Cloud not found" => "Nie odnaleziono chmury",
-"Edit categories" => "Edytuj kategorie",
-"Add" => "Dodaj",
+"The share will expire on %s.\n\n" => "Udostępnienie wygaśnie w dniu %s.\n\n",
+"Cheers!" => "Pozdrawiam!",
 "Security Warning" => "Ostrzeżenie o zabezpieczeniach",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Twója wersja PHP jest narażona na NULL Byte attack (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Proszę uaktualnij swoją instalacje PHP aby używać %s bezpiecznie.",
@@ -138,15 +132,20 @@ $TRANSLATIONS = array(
 "Database tablespace" => "Obszar tabel bazy danych",
 "Database host" => "Komputer bazy danych",
 "Finish setup" => "Zakończ konfigurowanie",
+"Finishing …" => "Kończę ...",
 "%s is available. Get more information on how to update." => "%s jest dostępna. Dowiedz się więcej na temat aktualizacji.",
 "Log out" => "Wyloguj",
 "Automatic logon rejected!" => "Automatyczne logowanie odrzucone!",
 "If you did not change your password recently, your account may be compromised!" => "Jeśli hasło było dawno niezmieniane, twoje konto może być zagrożone!",
 "Please change your password to secure your account again." => "Zmień swoje hasło, aby ponownie zabezpieczyć swoje konto.",
+"Server side authentication failed!" => "Uwierzytelnianie po stronie serwera nie powiodło się!",
+"Please contact your administrator." => "Skontaktuj się z administratorem",
 "Lost your password?" => "Nie pamiętasz hasła?",
 "remember" => "pamiętaj",
 "Log in" => "Zaloguj",
 "Alternative Logins" => "Alternatywne loginy",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Cześć,<br><br>Informuję cię że %s udostępnia ci »%s«.\n<br><a href=\"%s\">Zobacz!</a><br><br>",
+"The share will expire on %s.<br><br>" => "Udostępnienie wygaśnie w dniu %s.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Aktualizowanie ownCloud do wersji %s. Może to trochę potrwać."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index fc43814ae00601e3832faa80582aa8c0f1109c2e..d790b86766b1029037f0a5ed987ca2f2d0309e1d 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -9,14 +9,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "Atualizar cahe de arquivos, isto pode levar algum tempo...",
 "Updated filecache" => "Atualizar cache de arquivo",
 "... %d%% done ..." => "... %d%% concluído ...",
-"Category type not provided." => "Tipo de categoria não fornecido.",
-"No category to add?" => "Nenhuma categoria a adicionar?",
-"This category already exists: %s" => "Esta categoria já existe: %s",
-"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.",
-"No categories selected for deletion." => "Nenhuma categoria selecionada para remoção.",
-"Error removing %s from favorites." => "Erro ao remover %s dos favoritos.",
 "No image or file provided" => "Nenhuma imagem ou arquivo fornecido",
 "Unknown filetype" => "Tipo de arquivo desconhecido",
 "Invalid image" => "Imagem inválida",
@@ -68,12 +60,9 @@ $TRANSLATIONS = array(
 "(all selected)" => "(todos os selecionados)",
 "({count} selected)" => "({count} selecionados)",
 "Error loading file exists template" => "Erro ao carregar arquivo existe modelo",
-"The object type is not specified." => "O tipo de objeto não foi especificado.",
-"Error" => "Erro",
-"The app name is not specified." => "O nome do app não foi especificado.",
-"The required file {file} is not installed!" => "O arquivo {file} necessário não está instalado!",
 "Shared" => "Compartilhados",
 "Share" => "Compartilhar",
+"Error" => "Erro",
 "Error while sharing" => "Erro ao compartilhar",
 "Error while unsharing" => "Erro ao descompartilhar",
 "Error while changing permissions" => "Erro ao mudar permissões",
@@ -106,6 +95,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Enviando ...",
 "Email sent" => "E-mail enviado",
 "Warning" => "Aviso",
+"The object type is not specified." => "O tipo de objeto não foi especificado.",
+"Delete" => "Eliminar",
+"Add" => "Adicionar",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A atualização falhou. Por favor, relate este problema para a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "A atualização teve êxito. Você será redirecionado ao ownCloud agora.",
 "%s password reset" => "%s redefinir senha",
@@ -131,8 +123,6 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Olá,\n\ngostaria que você soubesse que %s compartilhou %s com vecê.\nVeja isto: %s\n\n",
 "The share will expire on %s.\n\n" => "O compartilhamento irá expirer em %s.\n\n",
 "Cheers!" => "Saúde!",
-"Edit categories" => "Editar categorias",
-"Add" => "Adicionar",
 "Security Warning" => "Aviso de Segurança",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Sua versão do PHP está vulnerável ao ataque NULL Byte (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Por favor, atualize sua instalação PHP para usar %s segurança.",
@@ -157,6 +147,8 @@ $TRANSLATIONS = array(
 "Automatic logon rejected!" => "Entrada Automática no Sistema Rejeitada!",
 "If you did not change your password recently, your account may be compromised!" => "Se você não mudou a sua senha recentemente, a sua conta pode estar comprometida!",
 "Please change your password to secure your account again." => "Por favor troque sua senha para tornar sua conta segura novamente.",
+"Server side authentication failed!" => "Autenticação do servidor falhou!",
+"Please contact your administrator." => "Por favor, contate o administrador.",
 "Lost your password?" => "Esqueceu sua senha?",
 "remember" => "lembrar",
 "Log in" => "Fazer login",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index fd504421199f2e3d35c7b6c71442506c3d654224..c14cb7187492b413804c505d358d1204dbdf82bd 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -8,14 +8,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "A actualizar o cache dos ficheiros, poderá demorar algum tempo...",
 "Updated filecache" => "Actualizado o cache dos ficheiros",
 "... %d%% done ..." => "... %d%% feito ...",
-"Category type not provided." => "Tipo de categoria não fornecido",
-"No category to add?" => "Nenhuma categoria para adicionar?",
-"This category already exists: %s" => "A categoria já existe: %s",
-"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",
-"No categories selected for deletion." => "Nenhuma categoria seleccionada para eliminar.",
-"Error removing %s from favorites." => "Erro a remover %s dos favoritos.",
 "No image or file provided" => "Não foi selecionado nenhum ficheiro para importar",
 "Unknown filetype" => "Ficheiro desconhecido",
 "Invalid image" => "Imagem inválida",
@@ -58,12 +50,9 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Erro ao carregar o template: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Cancelar",
-"The object type is not specified." => "O tipo de objecto não foi especificado",
-"Error" => "Erro",
-"The app name is not specified." => "O nome da aplicação não foi especificado",
-"The required file {file} is not installed!" => "O ficheiro necessário {file} não está instalado!",
 "Shared" => "Partilhado",
 "Share" => "Partilhar",
+"Error" => "Erro",
 "Error while sharing" => "Erro ao partilhar",
 "Error while unsharing" => "Erro ao deixar de partilhar",
 "Error while changing permissions" => "Erro ao mudar permissões",
@@ -95,6 +84,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "A Enviar...",
 "Email sent" => "E-mail enviado",
 "Warning" => "Aviso",
+"The object type is not specified." => "O tipo de objecto não foi especificado",
+"Delete" => "Eliminar",
+"Add" => "Adicionar",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A actualização falhou. Por favor reporte este incidente seguindo este link <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.",
 "%s password reset" => "%s reposição da password",
@@ -117,8 +109,6 @@ $TRANSLATIONS = array(
 "Help" => "Ajuda",
 "Access forbidden" => "Acesso interdito",
 "Cloud not found" => "Cloud nao encontrada",
-"Edit categories" => "Editar categorias",
-"Add" => "Adicionar",
 "Security Warning" => "Aviso de Segurança",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "A sua versão do PHP é vulnerável ao ataque Byte Null (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Por favor atualize a sua versão PHP instalada para usar o %s com segurança.",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 73350011f1e937acd753f2154250ab1fc0ca3b1d..1224dcfd3327c060addec4a9430bb8dd61c96965 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -3,14 +3,6 @@ $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s Partajat »%s« cu tine de",
 "group" => "grup",
 "Updated database" => "Bază de date actualizată",
-"Category type not provided." => "Tipul de categorie nu a fost specificat.",
-"No category to add?" => "Nici o categorie de adăugat?",
-"This category already exists: %s" => "Această categorie deja există: %s",
-"Object type not provided." => "Tipul obiectului nu este prevăzut",
-"%s ID not provided." => "ID-ul %s nu a fost introdus",
-"Error adding %s to favorites." => "Eroare la adăugarea %s la favorite.",
-"No categories selected for deletion." => "Nicio categorie selectată pentru ștergere.",
-"Error removing %s from favorites." => "Eroare la ștergerea %s din favorite.",
 "Unknown filetype" => "Tip fișier necunoscut",
 "Invalid image" => "Imagine invalidă",
 "Sunday" => "Duminică",
@@ -54,12 +46,9 @@ $TRANSLATIONS = array(
 "If you select both versions, the copied file will have a number added to its name." => "Dacă alegi ambele versiuni, fișierul copiat va avea un număr atașat la denumirea sa.",
 "Cancel" => "Anulare",
 "Continue" => "Continuă",
-"The object type is not specified." => "Tipul obiectului nu este specificat.",
-"Error" => "Eroare",
-"The app name is not specified." => "Numele aplicației nu este specificat.",
-"The required file {file} is not installed!" => "Fișierul obligatoriu {file} nu este instalat!",
 "Shared" => "Partajat",
 "Share" => "Partajează",
+"Error" => "Eroare",
 "Error while sharing" => "Eroare la partajare",
 "Error while unsharing" => "Eroare la anularea partajării",
 "Error while changing permissions" => "Eroare la modificarea permisiunilor",
@@ -91,6 +80,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Se expediază...",
 "Email sent" => "Mesajul a fost expediat",
 "Warning" => "Atenție",
+"The object type is not specified." => "Tipul obiectului nu este specificat.",
+"Delete" => "Șterge",
+"Add" => "Adaugă",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Actualizarea a eșuat! Raportați problema către <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunitatea ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Actualizare reușită. Ești redirecționat către ownCloud.",
 "Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {link}",
@@ -112,8 +104,6 @@ $TRANSLATIONS = array(
 "Help" => "Ajutor",
 "Access forbidden" => "Acces restricționat",
 "Cloud not found" => "Nu s-a găsit",
-"Edit categories" => "Editează categorii",
-"Add" => "Adaugă",
 "Security Warning" => "Avertisment de securitate",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versiunea dvs. PHP este vulnerabilă la un atac cu un octet NULL  (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Te rog actualizează versiunea PHP pentru a utiliza %s în mod securizat.",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 5cfd013850e252adc373ad383a0951e5f5256a6d..25ba4f680bc6ba4c853a248684d434b442a32409 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -8,14 +8,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "Обновление файлового кэша, это может занять некоторое время...",
 "Updated filecache" => "Обновлен файловый кэш",
 "... %d%% done ..." => "... %d%% завершено ...",
-"Category type not provided." => "Тип категории не предоставлен",
-"No category to add?" => "Нет категорий для добавления?",
-"This category already exists: %s" => "Эта категория уже существует: %s",
-"Object type not provided." => "Тип объекта не предоставлен",
-"%s ID not provided." => "ID %s не  предоставлен",
-"Error adding %s to favorites." => "Ошибка добавления %s в избранное",
-"No categories selected for deletion." => "Нет категорий для удаления.",
-"Error removing %s from favorites." => "Ошибка удаления %s из избранного",
 "No image or file provided" => "Не указано изображение или файл",
 "Unknown filetype" => "Неизвестный тип файла",
 "Invalid image" => "Изображение повреждено",
@@ -67,12 +59,9 @@ $TRANSLATIONS = array(
 "(all selected)" => "(выбраны все)",
 "({count} selected)" => "({count} выбрано)",
 "Error loading file exists template" => "Ошибка при загрузке шаблона существующего файла",
-"The object type is not specified." => "Тип объекта не указан",
-"Error" => "Ошибка",
-"The app name is not specified." => "Имя приложения не указано",
-"The required file {file} is not installed!" => "Необходимый файл {file} не установлен!",
 "Shared" => "Общие",
 "Share" => "Открыть доступ",
+"Error" => "Ошибка",
 "Error while sharing" => "Ошибка при открытии доступа",
 "Error while unsharing" => "Ошибка при закрытии доступа",
 "Error while changing permissions" => "Ошибка при смене разрешений",
@@ -104,6 +93,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Отправляется ...",
 "Email sent" => "Письмо отправлено",
 "Warning" => "Предупреждение",
+"The object type is not specified." => "Тип объекта не указан",
+"Delete" => "Удалить",
+"Add" => "Добавить",
 "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...",
 "%s password reset" => "%s сброс пароля",
@@ -126,8 +118,6 @@ $TRANSLATIONS = array(
 "Help" => "Помощь",
 "Access forbidden" => "Доступ запрещён",
 "Cloud not found" => "Облако не найдено",
-"Edit categories" => "Редактировать категрии",
-"Add" => "Добавить",
 "Security Warning" => "Предупреждение безопасности",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ваша версия PHP уязвима к атаке NULL Byte (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Пожалуйста обновите Вашу PHP конфигурацию для безопасного использования %s.",
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index 065604425bd13c6b4febb24b43563b7a8181c2a8..ecff37052872b7595014eb40599afe3d29bc05ec 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "group" => "කණ්ඩායම",
-"No categories selected for deletion." => "මකා දැමීම සඳහා ප්‍රවර්ගයන් තෝරා නොමැත.",
 "Sunday" => "ඉරිදා",
 "Monday" => "සඳුදා",
 "Tuesday" => "අඟහරුවාදා",
@@ -39,8 +38,8 @@ $TRANSLATIONS = array(
 "Ok" => "හරි",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "එපා",
-"Error" => "දෝෂයක්",
 "Share" => "බෙදා හදා ගන්න",
+"Error" => "දෝෂයක්",
 "Share with" => "බෙදාගන්න",
 "Share with link" => "යොමුවක් මඟින් බෙදාගන්න",
 "Password protect" => "මුර පදයකින් ආරක්ශාකරන්න",
@@ -59,6 +58,8 @@ $TRANSLATIONS = array(
 "Error unsetting expiration date" => "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්",
 "Error setting expiration date" => "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්",
 "Warning" => "අවවාදය",
+"Delete" => "මකා දමන්න",
+"Add" => "එකතු කරන්න",
 "You will receive a link to reset your password via Email." => "ඔබගේ මුරපදය ප්‍රත්‍යාරම්භ කිරීම සඳහා යොමුව විද්‍යුත් තැපෑලෙන් ලැබෙනු ඇත",
 "Username" => "පරිශීලක නම",
 "Your password was reset" => "ඔබේ මුරපදය ප්‍රත්‍යාරම්භ කරන ලදී",
@@ -72,8 +73,6 @@ $TRANSLATIONS = array(
 "Help" => "උදව්",
 "Access forbidden" => "ඇතුල් වීම තහනම්",
 "Cloud not found" => "සොයා ගත නොහැක",
-"Edit categories" => "ප්‍රභේදයන් සංස්කරණය",
-"Add" => "එකතු කරන්න",
 "Security Warning" => "ආරක්ෂක නිවේදනයක්",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ආරක්ෂිත අහඹු සංඛ්‍යා උත්පාදකයක් නොමැති නම් ඔබගේ ගිණුමට පහරදෙන අයකුට එහි මුරපද යළි පිහිටුවීමට අවශ්‍ය ටෝකන පහසුවෙන් සොයාගෙන ඔබගේ ගිණුම පැහැරගත හැක.",
 "Advanced" => "දියුණු/උසස්",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index b4bcaac8ae0297d5634c089dcebb3f1a3924e2e7..db29395a7f6e3be8fe436c64df67ba0684a71239 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -8,14 +8,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "Aktualizácia \"filecache\", toto môže trvať dlhšie...",
 "Updated filecache" => "\"Filecache\" aktualizovaná",
 "... %d%% done ..." => "... %d%% dokončených ...",
-"Category type not provided." => "Neposkytnutý typ kategórie.",
-"No category to add?" => "Žiadna kategória pre pridanie?",
-"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.",
-"No categories selected for deletion." => "Neboli vybrané žiadne kategórie pre odstránenie.",
-"Error removing %s from favorites." => "Chyba pri odstraňovaní %s z obľúbených položiek.",
 "Sunday" => "Nedeľa",
 "Monday" => "Pondelok",
 "Tuesday" => "Utorok",
@@ -53,12 +45,9 @@ $TRANSLATIONS = array(
 "Ok" => "Ok",
 "_{count} file conflict_::_{count} file conflicts_" => array("","",""),
 "Cancel" => "Zrušiť",
-"The object type is not specified." => "Nešpecifikovaný typ objektu.",
-"Error" => "Chyba",
-"The app name is not specified." => "Nešpecifikované meno aplikácie.",
-"The required file {file} is not installed!" => "Požadovaný súbor {file} nie je nainštalovaný!",
 "Shared" => "Zdieľané",
 "Share" => "Zdieľať",
+"Error" => "Chyba",
 "Error while sharing" => "Chyba počas zdieľania",
 "Error while unsharing" => "Chyba počas ukončenia zdieľania",
 "Error while changing permissions" => "Chyba počas zmeny oprávnení",
@@ -90,6 +79,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Odosielam ...",
 "Email sent" => "Email odoslaný",
 "Warning" => "Varovanie",
+"The object type is not specified." => "Nešpecifikovaný typ objektu.",
+"Delete" => "Zmazať",
+"Add" => "Pridať",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizácia nebola úspešná. Problém nahláste na <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Aktualizácia bola úspešná. Presmerovávam na prihlasovaciu stránku.",
 "%s password reset" => "reset hesla %s",
@@ -112,8 +104,6 @@ $TRANSLATIONS = array(
 "Help" => "Pomoc",
 "Access forbidden" => "Prístup odmietnutý",
 "Cloud not found" => "Nenájdené",
-"Edit categories" => "Upraviť kategórie",
-"Add" => "Pridať",
 "Security Warning" => "Bezpečnostné varovanie",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Verzia Vášho PHP je napadnuteľná pomocou techniky \"NULL Byte\" (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Aktualizujte prosím vašu inštanciu PHP pre bezpečné používanie %s.",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index e858284de53cd8f6fae7944102ba86df60fe2897..46c7b7b24522d7f3402f3ff0fc5cf40068fb70c3 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -2,14 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s je delil »%s« z vami",
 "group" => "skupina",
-"Category type not provided." => "Vrsta kategorije ni podana.",
-"No category to add?" => "Ali ni kategorije za dodajanje?",
-"This category already exists: %s" => "Kategorija že obstaja: %s",
-"Object type not provided." => "Vrsta predmeta ni podana.",
-"%s ID not provided." => "ID %s ni podan.",
-"Error adding %s to favorites." => "Napaka dodajanja %s med priljubljene predmete.",
-"No categories selected for deletion." => "Za izbris ni izbrana nobena kategorija.",
-"Error removing %s from favorites." => "Napaka odstranjevanja %s iz priljubljenih predmetov.",
 "Sunday" => "nedelja",
 "Monday" => "ponedeljek",
 "Tuesday" => "torek",
@@ -47,12 +39,9 @@ $TRANSLATIONS = array(
 "Ok" => "V redu",
 "_{count} file conflict_::_{count} file conflicts_" => array("","","",""),
 "Cancel" => "Prekliči",
-"The object type is not specified." => "Vrsta predmeta ni podana.",
-"Error" => "Napaka",
-"The app name is not specified." => "Ime programa ni podano.",
-"The required file {file} is not installed!" => "Zahtevana datoteka {file} ni nameščena!",
 "Shared" => "V souporabi",
 "Share" => "Souporaba",
+"Error" => "Napaka",
 "Error while sharing" => "Napaka med souporabo",
 "Error while unsharing" => "Napaka med odstranjevanjem souporabe",
 "Error while changing permissions" => "Napaka med spreminjanjem dovoljenj",
@@ -84,6 +73,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Pošiljanje ...",
 "Email sent" => "Elektronska pošta je poslana",
 "Warning" => "Opozorilo",
+"The object type is not specified." => "Vrsta predmeta ni podana.",
+"Delete" => "Izbriši",
+"Add" => "Dodaj",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Posodobitev ni uspela. Pošljite poročilo o napaki na sistemu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.",
 "Use the following link to reset your password: {link}" => "Za ponastavitev gesla uporabite povezavo: {link}",
@@ -105,8 +97,6 @@ $TRANSLATIONS = array(
 "Help" => "Pomoč",
 "Access forbidden" => "Dostop je prepovedan",
 "Cloud not found" => "Oblaka ni mogoče najti",
-"Edit categories" => "Uredi kategorije",
-"Add" => "Dodaj",
 "Security Warning" => "Varnostno opozorilo",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Uporabljena različica PHP je ranljiva za napad NULL Byte (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Za varno uporabo storitve %s posodobite PHP",
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index 2d9649a64834076bb05e66215835c38bf1c20791..c0bfee52412d718865bdffaa6f3cd5fe8a8066c1 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -8,14 +8,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "Po azhurnoj memorjen e skedarëve, mund të zgjasi pak...",
 "Updated filecache" => "Memorja e skedarëve u azhornua",
 "... %d%% done ..." => "... %d%% u krye ...",
-"Category type not provided." => "Mungon tipi i kategorisë.",
-"No category to add?" => "Asnjë kategori për të shtuar?",
-"This category already exists: %s" => "Kjo kategori tashmë ekziston: %s",
-"Object type not provided." => "Mungon tipi i objektit.",
-"%s ID not provided." => "Mungon ID-ja e %s.",
-"Error adding %s to favorites." => "Veprim i gabuar gjatë shtimit të %s tek të parapëlqyerat.",
-"No categories selected for deletion." => "Nuk selektuar për tu eliminuar asnjë kategori.",
-"Error removing %s from favorites." => "Veprim i gabuar gjatë heqjes së %s nga të parapëlqyerat.",
 "Sunday" => "E djelë",
 "Monday" => "E hënë",
 "Tuesday" => "E martë",
@@ -53,12 +45,9 @@ $TRANSLATIONS = array(
 "Ok" => "Në rregull",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Anulo",
-"The object type is not specified." => "Nuk është specifikuar tipi i objektit.",
-"Error" => "Veprim i gabuar",
-"The app name is not specified." => "Nuk është specifikuar emri i app-it.",
-"The required file {file} is not installed!" => "Skedari i nevojshëm {file} nuk është i instaluar!",
 "Shared" => "Ndarë",
 "Share" => "Nda",
+"Error" => "Veprim i gabuar",
 "Error while sharing" => "Veprim i gabuar gjatë ndarjes",
 "Error while unsharing" => "Veprim i gabuar gjatë heqjes së ndarjes",
 "Error while changing permissions" => "Veprim i gabuar gjatë ndryshimit të lejeve",
@@ -89,6 +78,9 @@ $TRANSLATIONS = array(
 "Error setting expiration date" => "Veprim i gabuar gjatë caktimit të datës së përfundimit",
 "Sending ..." => "Duke dërguar...",
 "Email sent" => "Email-i u dërgua",
+"The object type is not specified." => "Nuk është specifikuar tipi i objektit.",
+"Delete" => "Elimino",
+"Add" => "Shto",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Azhurnimi dështoi. Ju lutemi njoftoni për këtë problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitetin ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
 "%s password reset" => "Kodi i %s -it u rivendos",
@@ -111,8 +103,6 @@ $TRANSLATIONS = array(
 "Help" => "Ndihmë",
 "Access forbidden" => "Ndalohet hyrja",
 "Cloud not found" => "Cloud-i nuk u gjet",
-"Edit categories" => "Ndrysho kategoritë",
-"Add" => "Shto",
 "Security Warning" => "Paralajmërim sigurie",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versioni juaj i PHP-së është i cënueshëm nga sulmi NULL Byte (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Ju lutem azhurnoni instalimin tuaj të PHP-së që të përdorni %s -in në mënyrë të sigurt.",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 666223c6cba2102f27237be515d54235d0c85d71..4b1d41f289a9fc1d4e357f3cff2e0fa1f3eca4cb 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -1,13 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "group" => "група",
-"Category type not provided." => "Врста категорије није унет.",
-"No category to add?" => "Додати још неку категорију?",
-"Object type not provided." => "Врста објекта није унета.",
-"%s ID not provided." => "%s ИД нису унети.",
-"Error adding %s to favorites." => "Грешка приликом додавања %s у омиљене.",
-"No categories selected for deletion." => "Ни једна категорија није означена за брисање.",
-"Error removing %s from favorites." => "Грешка приликом уклањања %s из омиљених",
 "Sunday" => "Недеља",
 "Monday" => "Понедељак",
 "Tuesday" => "Уторак",
@@ -45,11 +38,8 @@ $TRANSLATIONS = array(
 "Ok" => "У реду",
 "_{count} file conflict_::_{count} file conflicts_" => array("","",""),
 "Cancel" => "Откажи",
-"The object type is not specified." => "Врста објекта није подешена.",
-"Error" => "Грешка",
-"The app name is not specified." => "Име програма није унето.",
-"The required file {file} is not installed!" => "Потребна датотека {file} није инсталирана.",
 "Share" => "Дели",
+"Error" => "Грешка",
 "Error while sharing" => "Грешка у дељењу",
 "Error while unsharing" => "Грешка код искључења дељења",
 "Error while changing permissions" => "Грешка код промене дозвола",
@@ -79,6 +69,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Шаљем...",
 "Email sent" => "Порука је послата",
 "Warning" => "Упозорење",
+"The object type is not specified." => "Врста објекта није подешена.",
+"Delete" => "Обриши",
+"Add" => "Додај",
 "Use the following link to reset your password: {link}" => "Овом везом ресетујте своју лозинку: {link}",
 "You will receive a link to reset your password via Email." => "Добићете везу за ресетовање лозинке путем е-поште.",
 "Username" => "Корисничко име",
@@ -94,8 +87,6 @@ $TRANSLATIONS = array(
 "Help" => "Помоћ",
 "Access forbidden" => "Забрањен приступ",
 "Cloud not found" => "Облак није нађен",
-"Edit categories" => "Измени категорије",
-"Add" => "Додај",
 "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." => "Без поузданог генератора случајнох бројева нападач лако може предвидети лозинку за поништавање кључа шифровања и отети вам налог.",
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index 8c0d28ef1c080dfa337379fe64f0ccc6e6343141..04a4b758bb19b12c5e6b74e852310bdf9e1bf5ce 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -1,13 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Category type not provided." => "Tip kategorije nije zadan.",
-"No category to add?" => "Bez dodavanja kategorije?",
-"This category already exists: %s" => "Kategorija već postoji: %s",
-"Object type not provided." => "Tip objekta nije zadan.",
-"%s ID not provided." => "%s ID nije zadan.",
-"Error adding %s to favorites." => "Greška u dodavanju %s u omiljeno.",
-"No categories selected for deletion." => "Kategorije za brisanje nisu izabrane.",
-"Error removing %s from favorites." => "Greška u uklanjanju %s iz omiljeno.",
 "Sunday" => "Nedelja",
 "Monday" => "Ponedeljak",
 "Tuesday" => "Utorak",
@@ -45,12 +37,9 @@ $TRANSLATIONS = array(
 "Ok" => "Ok",
 "_{count} file conflict_::_{count} file conflicts_" => array("","",""),
 "Cancel" => "Otkaži",
-"The object type is not specified." => "Tip objekta nije zadan.",
-"Error" => "Greška",
-"The app name is not specified." => "Ime aplikacije nije precizirano.",
-"The required file {file} is not installed!" => "Potreban fajl {file} nije instaliran!",
 "Shared" => "Deljeno",
 "Share" => "Podeli",
+"Error" => "Greška",
 "Error while sharing" => "Greška pri deljenju",
 "Error while unsharing" => "Greška u uklanjanju deljenja",
 "Error while changing permissions" => "Greška u promeni dozvola",
@@ -80,6 +69,9 @@ $TRANSLATIONS = array(
 "Error setting expiration date" => "Greška u postavljanju datuma isteka",
 "Sending ..." => "Slanje...",
 "Email sent" => "Email poslat",
+"The object type is not specified." => "Tip objekta nije zadan.",
+"Delete" => "Obriši",
+"Add" => "Dodaj",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Ažuriranje nije uspelo. Molimo obavestite <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud zajednicu</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Ažuriranje je uspelo. Prosleđivanje na ownCloud.",
 "Use the following link to reset your password: {link}" => "Koristite sledeći link za reset lozinke: {link}",
@@ -97,8 +89,6 @@ $TRANSLATIONS = array(
 "Help" => "Pomoć",
 "Access forbidden" => "Pristup zabranjen",
 "Cloud not found" => "Oblak nije nađen",
-"Edit categories" => "Izmena kategorija",
-"Add" => "Dodaj",
 "Security Warning" => "Bezbednosno upozorenje",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Vaša PHP verzija je ranjiva na ",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nije dostupan generator slučajnog broja, molimo omogućite PHP OpenSSL ekstenziju.",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 299365374182cc0fd8da8581eb1122ed34f56c8e..239b9495ef386f3d63d7de4f4f5d52ea2980d4f5 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s delade »%s« med dig",
+"Couldn't send mail to following users: %s " => "Gick inte att skicka e-post till följande användare: %s",
 "group" => "Grupp",
 "Turned on maintenance mode" => "Aktiverade underhållsläge",
 "Turned off maintenance mode" => "Deaktiverade underhållsläge",
@@ -8,14 +9,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "Uppdaterar filcache, det kan ta lång tid...",
 "Updated filecache" => "Uppdaterade filcache",
 "... %d%% done ..." => "... %d%% klart ...",
-"Category type not provided." => "Kategorityp inte angiven.",
-"No category to add?" => "Ingen kategori att lägga till?",
-"This category already exists: %s" => "Denna kategori finns redan: %s",
-"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.",
-"No categories selected for deletion." => "Inga kategorier valda för radering.",
-"Error removing %s from favorites." => "Fel vid borttagning av %s från favoriter.",
 "No image or file provided" => "Ingen bild eller fil har tillhandahållits",
 "Unknown filetype" => "Okänd filtyp",
 "Invalid image" => "Ogiltig bild",
@@ -67,12 +60,9 @@ $TRANSLATIONS = array(
 "(all selected)" => "(Alla valda)",
 "({count} selected)" => "({count} valda)",
 "Error loading file exists template" => "Fel uppstod filmall existerar",
-"The object type is not specified." => "Objekttypen är inte specificerad.",
-"Error" => "Fel",
-"The app name is not specified." => " Namnet på appen är inte specificerad.",
-"The required file {file} is not installed!" => "Den nödvändiga filen {file} är inte installerad!",
 "Shared" => "Delad",
 "Share" => "Dela",
+"Error" => "Fel",
 "Error while sharing" => "Fel vid delning",
 "Error while unsharing" => "Fel när delning skulle avslutas",
 "Error while changing permissions" => "Fel vid ändring av rättigheter",
@@ -92,6 +82,7 @@ $TRANSLATIONS = array(
 "Resharing is not allowed" => "Dela vidare är inte tillåtet",
 "Shared in {item} with {user}" => "Delad i {item} med {user}",
 "Unshare" => "Sluta dela",
+"notify user by email" => "notifiera användare via e-post",
 "can edit" => "kan redigera",
 "access control" => "åtkomstkontroll",
 "create" => "skapa",
@@ -104,6 +95,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Skickar ...",
 "Email sent" => "E-post skickat",
 "Warning" => "Varning",
+"The object type is not specified." => "Objekttypen är inte specificerad.",
+"Delete" => "Radera",
+"Add" => "Lägg till",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud.",
 "%s password reset" => "%s återställ lösenord",
@@ -126,8 +120,9 @@ $TRANSLATIONS = array(
 "Help" => "Hjälp",
 "Access forbidden" => "Åtkomst förbjuden",
 "Cloud not found" => "Hittade inget moln",
-"Edit categories" => "Editera kategorier",
-"Add" => "Lägg till",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hej där,⏎\n⏎\nville bara meddela dig att %s delade %s med dig.⏎\nTitta på den: %s⏎\n⏎\n",
+"The share will expire on %s.\n\n" => "Utdelningen kommer att upphöra %s.⏎\n⏎\n",
+"Cheers!" => "Vi höres!",
 "Security Warning" => "Säkerhetsvarning",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Din version av PHP är sårbar för NULL byte attack (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Var god uppdatera din PHP-installation för att använda %s säkert.",
@@ -146,15 +141,20 @@ $TRANSLATIONS = array(
 "Database tablespace" => "Databas tabellutrymme",
 "Database host" => "Databasserver",
 "Finish setup" => "Avsluta installation",
+"Finishing …" => "Avslutar ...",
 "%s is available. Get more information on how to update." => "%s är tillgänglig. Få mer information om hur du går tillväga för att uppdatera.",
 "Log out" => "Logga ut",
 "Automatic logon rejected!" => "Automatisk inloggning inte tillåten!",
 "If you did not change your password recently, your account may be compromised!" => "Om du inte har ändrat ditt lösenord nyligen så kan ditt konto vara manipulerat!",
 "Please change your password to secure your account again." => "Ändra genast lösenord för att säkra ditt konto.",
+"Server side authentication failed!" => "Servern misslyckades med autentisering!",
+"Please contact your administrator." => "Kontakta din administratör.",
 "Lost your password?" => "Glömt ditt lösenord?",
 "remember" => "kom ihåg",
 "Log in" => "Logga in",
 "Alternative Logins" => "Alternativa inloggningar",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hej där,<br><br>ville bara informera dig om att %s delade »%s« med dig.<br><a href=\"%s\">Titta på den!</a><br><br>",
+"The share will expire on %s.<br><br>" => "Utdelningen kommer att upphöra %s.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Uppdaterar ownCloud till version %s, detta kan ta en stund."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index 1756d22c7884a7a2d5a7474710a5c46d7a7e7ece..7dba820066d37830ada8dcb5ec1386707a11d287 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -1,13 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "group" => "குழு",
-"Category type not provided." => "பிரிவு வகைகள் வழங்கப்படவில்லை",
-"No category to add?" => "சேர்ப்பதற்கான வகைகள் இல்லையா?",
-"Object type not provided." => "பொருள் வகை வழங்கப்படவில்லை",
-"%s ID not provided." => "%s ID வழங்கப்படவில்லை",
-"Error adding %s to favorites." => "விருப்பங்களுக்கு %s ஐ சேர்ப்பதில் வழு",
-"No categories selected for deletion." => "நீக்குவதற்கு எந்தப் பிரிவும் தெரிவுசெய்யப்படவில்லை.",
-"Error removing %s from favorites." => "விருப்பத்திலிருந்து %s ஐ அகற்றுவதில் வழு.உஇஇ",
 "Sunday" => "ஞாயிற்றுக்கிழமை",
 "Monday" => "திங்கட்கிழமை",
 "Tuesday" => "செவ்வாய்க்கிழமை",
@@ -45,11 +38,8 @@ $TRANSLATIONS = array(
 "Ok" => "சரி",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "இரத்து செய்க",
-"The object type is not specified." => "பொருள் வகை குறிப்பிடப்படவில்லை.",
-"Error" => "வழு",
-"The app name is not specified." => "செயலி பெயர் குறிப்பிடப்படவில்லை.",
-"The required file {file} is not installed!" => "தேவைப்பட்ட கோப்பு {கோப்பு} நிறுவப்படவில்லை!",
 "Share" => "பகிர்வு",
+"Error" => "வழு",
 "Error while sharing" => "பகிரும் போதான வழு",
 "Error while unsharing" => "பகிராமல் உள்ளப்போதான வழு",
 "Error while changing permissions" => "அனுமதிகள் மாறும்போதான வழு",
@@ -76,6 +66,9 @@ $TRANSLATIONS = array(
 "Error unsetting expiration date" => "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு",
 "Error setting expiration date" => "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு",
 "Warning" => "எச்சரிக்கை",
+"The object type is not specified." => "பொருள் வகை குறிப்பிடப்படவில்லை.",
+"Delete" => "நீக்குக",
+"Add" => "சேர்க்க",
 "Use the following link to reset your password: {link}" => "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}",
 "You will receive a link to reset your password via Email." => "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ",
 "Username" => "பயனாளர் பெயர்",
@@ -91,8 +84,6 @@ $TRANSLATIONS = array(
 "Help" => "உதவி",
 "Access forbidden" => "அணுக தடை",
 "Cloud not found" => "Cloud காணப்படவில்லை",
-"Edit categories" => "வகைகளை தொகுக்க",
-"Add" => "சேர்க்க",
 "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." => "பாதுகாப்பான சீரற்ற எண்ணிக்கையான புறப்பாக்கி இல்லையெனின், தாக்குனரால் கடவுச்சொல் மீளமைப்பு அடையாளவில்லைகள் முன்மொழியப்பட்டு உங்களுடைய கணக்கை கைப்பற்றலாம்.",
diff --git a/core/l10n/te.php b/core/l10n/te.php
index d54eeabb69223a8b58fac0dbe18dd0da2bf5d34b..0754429351c6ba38ad0f111980e6f9cceb472149 100644
--- a/core/l10n/te.php
+++ b/core/l10n/te.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"This category already exists: %s" => "ఈ వర్గం ఇప్పటికే ఉంది: %s",
 "Sunday" => "ఆదివారం",
 "Monday" => "సోమవారం",
 "Tuesday" => "మంగళవారం",
@@ -42,11 +41,12 @@ $TRANSLATIONS = array(
 "Send" => "పంపించు",
 "Expiration date" => "కాలం చెల్లు తేదీ",
 "delete" => "తొలగించు",
+"Delete" => "తొలగించు",
+"Add" => "చేర్చు",
 "Username" => "వాడుకరి పేరు",
 "New password" => "కొత్త సంకేతపదం",
 "Users" => "వాడుకరులు",
 "Help" => "సహాయం",
-"Add" => "చేర్చు",
 "Log out" => "నిష్క్రమించు",
 "Lost your password?" => "మీ సంకేతపదం పోయిందా?"
 );
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index c6c0e94a32e945ca9395977feb68d95da017fe18..8deb3ef20df4334ef956b07b81f133331e4766b8 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -1,13 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "group" => "กลุ่มผู้ใช้งาน",
-"Category type not provided." => "ยังไม่ได้ระบุชนิดของหมวดหมู่",
-"No category to add?" => "ไม่มีหมวดหมู่ที่ต้องการเพิ่ม?",
-"Object type not provided." => "ชนิดของวัตถุยังไม่ได้ถูกระบุ",
-"%s ID not provided." => "ยังไม่ได้ระบุรหัส %s",
-"Error adding %s to favorites." => "เกิดข้อผิดพลาดในการเพิ่ม %s เข้าไปยังรายการโปรด",
-"No categories selected for deletion." => "ยังไม่ได้เลือกหมวดหมู่ที่ต้องการลบ",
-"Error removing %s from favorites." => "เกิดข้อผิดพลาดในการลบ %s ออกจากรายการโปรด",
 "Sunday" => "วันอาทิตย์",
 "Monday" => "วันจันทร์",
 "Tuesday" => "วันอังคาร",
@@ -45,12 +38,9 @@ $TRANSLATIONS = array(
 "Ok" => "ตกลง",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
 "Cancel" => "ยกเลิก",
-"The object type is not specified." => "ชนิดของวัตถุยังไม่ได้รับการระบุ",
-"Error" => "ข้อผิดพลาด",
-"The app name is not specified." => "ชื่อของแอปยังไม่ได้รับการระบุชื่อ",
-"The required file {file} is not installed!" => "ไฟล์ {file} ซึ่งเป็นไฟล์ที่จำเป็นต้องได้รับการติดตั้งไว้ก่อน ยังไม่ได้ถูกติดตั้ง",
 "Shared" => "แชร์แล้ว",
 "Share" => "แชร์",
+"Error" => "ข้อผิดพลาด",
 "Error while sharing" => "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล",
 "Error while unsharing" => "เกิดข้อผิดพลาดในการยกเลิกการแชร์ข้อมูล",
 "Error while changing permissions" => "เกิดข้อผิดพลาดในการเปลี่ยนสิทธิ์การเข้าใช้งาน",
@@ -81,6 +71,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "กำลังส่ง...",
 "Email sent" => "ส่งอีเมล์แล้ว",
 "Warning" => "คำเตือน",
+"The object type is not specified." => "ชนิดของวัตถุยังไม่ได้รับการระบุ",
+"Delete" => "ลบ",
+"Add" => "เพิ่ม",
 "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 อยู่ในขณะนี้",
 "Use the following link to reset your password: {link}" => "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
@@ -98,8 +91,6 @@ $TRANSLATIONS = array(
 "Help" => "ช่วยเหลือ",
 "Access forbidden" => "การเข้าถึงถูกหวงห้าม",
 "Cloud not found" => "ไม่พบ Cloud",
-"Edit categories" => "แก้ไขหมวดหมู่",
-"Add" => "เพิ่ม",
 "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." => "หากปราศจากตัวสร้างหมายเลขแบบสุ่มที่ช่วยป้องกันความปลอดภัย ผู้บุกรุกอาจสามารถที่จะคาดคะเนรหัสยืนยันการเข้าถึงเพื่อรีเซ็ตรหัสผ่าน และเอาบัญชีของคุณไปเป็นของตนเองได้",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 57603895c94faebaa95aeb97307eeb5f805a5fed..c6787cc4fd6804cc2d602c8ee176222c5afed0a3 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -8,14 +8,8 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "Dosya önbelleği güncelleniyor. Bu, gerçekten uzun sürebilir.",
 "Updated filecache" => "Dosya önbelleği güncellendi",
 "... %d%% done ..." => "%%%d tamamlandı ...",
-"Category type not provided." => "Kategori türü girilmedi.",
-"No category to add?" => "Eklenecek kategori yok?",
-"This category already exists: %s" => "Bu kategori zaten mevcut:  %s",
-"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",
-"No categories selected for deletion." => "Silmek için bir kategori seçilmedi",
-"Error removing %s from favorites." => "%s favorilere çıkarılırken hata oluştu",
+"Unknown filetype" => "Bilinmeyen dosya türü",
+"Invalid image" => "Geçersiz resim",
 "Sunday" => "Pazar",
 "Monday" => "Pazartesi",
 "Tuesday" => "Salı",
@@ -53,12 +47,9 @@ $TRANSLATIONS = array(
 "Ok" => "Tamam",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "İptal",
-"The object type is not specified." => "Nesne türü belirtilmemiş.",
-"Error" => "Hata",
-"The app name is not specified." => "uygulama adı belirtilmedi.",
-"The required file {file} is not installed!" => "İhtiyaç duyulan {file} dosyası kurulu değil.",
 "Shared" => "Paylaşılan",
 "Share" => "Paylaş",
+"Error" => "Hata",
 "Error while sharing" => "Paylaşım sırasında hata  ",
 "Error while unsharing" => "Paylaşım iptal ediliyorken hata",
 "Error while changing permissions" => "İzinleri değiştirirken hata oluştu",
@@ -90,6 +81,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Gönderiliyor...",
 "Email sent" => "Eposta gönderildi",
 "Warning" => "Uyarı",
+"The object type is not specified." => "Nesne türü belirtilmemiş.",
+"Delete" => "Sil",
+"Add" => "Ekle",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Güncelleme başarılı olmadı. Lütfen bu hatayı bildirin <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Güncelleme başarılı. ownCloud'a yönlendiriliyor.",
 "%s password reset" => "%s parola sıfırlama",
@@ -112,8 +106,6 @@ $TRANSLATIONS = array(
 "Help" => "Yardım",
 "Access forbidden" => "Erişim yasaklı",
 "Cloud not found" => "Bulut bulunamadı",
-"Edit categories" => "Kategorileri düzenle",
-"Add" => "Ekle",
 "Security Warning" => "Güvenlik Uyarisi",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP sürümünüz NULL Byte saldırısına açık (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "%s güvenli olarak kullanmak için, lütfen PHP kurulumunuzu güncelleyin.",
diff --git a/core/l10n/ug.php b/core/l10n/ug.php
index 621c45d4d0aae7c94b208151a1ec0ebfdc3e74fd..3d9d39c854f981fac66cd72d5bb1b9363f10eacb 100644
--- a/core/l10n/ug.php
+++ b/core/l10n/ug.php
@@ -32,8 +32,8 @@ $TRANSLATIONS = array(
 "Ok" => "جەزملە",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
 "Cancel" => "ۋاز كەچ",
-"Error" => "خاتالىق",
 "Share" => "ھەمبەھىر",
+"Error" => "خاتالىق",
 "Share with" => "ھەمبەھىر",
 "Password" => "ئىم",
 "Send" => "يوللا",
@@ -41,14 +41,14 @@ $TRANSLATIONS = array(
 "delete" => "ئۆچۈر",
 "share" => "ھەمبەھىر",
 "Warning" => "ئاگاھلاندۇرۇش",
+"Delete" => "ئۆچۈر",
+"Add" => "قوش",
 "Username" => "ئىشلەتكۈچى ئاتى",
 "New password" => "يېڭى ئىم",
 "Personal" => "شەخسىي",
 "Users" => "ئىشلەتكۈچىلەر",
 "Apps" => "ئەپلەر",
 "Help" => "ياردەم",
-"Edit categories" => "تۈر تەھرىر",
-"Add" => "قوش",
 "Security Warning" => "بىخەتەرلىك ئاگاھلاندۇرۇش",
 "Advanced" => "ئالىي",
 "Finish setup" => "تەڭشەك تامام",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 6bd6901815d19475dd6e427ce059bdb13e649fb2..64e79abcdd0dd2d5be149f3a19cb030436e587b6 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -1,14 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "group" => "група",
-"Category type not provided." => "Не вказано тип категорії.",
-"No category to add?" => "Відсутні категорії для додавання?",
-"This category already exists: %s" => "Ця категорія вже існує: %s",
-"Object type not provided." => "Не вказано тип об'єкту.",
-"%s ID not provided." => "%s ID не вказано.",
-"Error adding %s to favorites." => "Помилка при додаванні %s до обраного.",
-"No categories selected for deletion." => "Жодної категорії не обрано для видалення.",
-"Error removing %s from favorites." => "Помилка при видалені %s із обраного.",
 "Sunday" => "Неділя",
 "Monday" => "Понеділок",
 "Tuesday" => "Вівторок",
@@ -46,12 +38,9 @@ $TRANSLATIONS = array(
 "Ok" => "Ok",
 "_{count} file conflict_::_{count} file conflicts_" => array("","",""),
 "Cancel" => "Відмінити",
-"The object type is not specified." => "Не визначено тип об'єкту.",
-"Error" => "Помилка",
-"The app name is not specified." => "Не визначено ім'я програми.",
-"The required file {file} is not installed!" => "Необхідний файл {file} не встановлено!",
 "Shared" => "Опубліковано",
 "Share" => "Поділитися",
+"Error" => "Помилка",
 "Error while sharing" => "Помилка під час публікації",
 "Error while unsharing" => "Помилка під час відміни публікації",
 "Error while changing permissions" => "Помилка при зміні повноважень",
@@ -82,6 +71,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Надсилання...",
 "Email sent" => "Ел. пошта надіслана",
 "Warning" => "Попередження",
+"The object type is not specified." => "Не визначено тип об'єкту.",
+"Delete" => "Видалити",
+"Add" => "Додати",
 "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.",
 "Use the following link to reset your password: {link}" => "Використовуйте наступне посилання для скидання пароля: {link}",
@@ -99,8 +91,6 @@ $TRANSLATIONS = array(
 "Help" => "Допомога",
 "Access forbidden" => "Доступ заборонено",
 "Cloud not found" => "Cloud не знайдено",
-"Edit categories" => "Редагувати категорії",
-"Add" => "Додати",
 "Security Warning" => "Попередження про небезпеку",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ваша версія PHP вразлива для атак NULL Byte (CVE-2006-7243)",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Не доступний безпечний генератор випадкових чисел, будь ласка, активуйте PHP OpenSSL додаток.",
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
index fc736779122e2b90d1b2d002f989e6a23ab2d636..9d40392c0852cc63485b86e4d3f056c9c465eee0 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -1,7 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"No category to add?" => "شامل کرنے کے لیے کوئی زمرہ نہیں؟",
-"No categories selected for deletion." => "ختم کرنے کے لیے کسی زمرہ جات کا انتخاب نہیں کیا گیا۔",
 "January" => "جنوری",
 "February" => "فرورئ",
 "March" => "مارچ",
@@ -45,6 +43,7 @@ $TRANSLATIONS = array(
 "delete" => "ختم کریں",
 "share" => "شئیر کریں",
 "Password protected" => "پاسورڈ سے محفوظ کیا گیا ہے",
+"Add" => "شامل کریں",
 "Use the following link to reset your password: {link}" => "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔  {link}",
 "You will receive a link to reset your password via Email." => "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے",
 "Username" => "یوزر نیم",
@@ -60,8 +59,6 @@ $TRANSLATIONS = array(
 "Help" => "مدد",
 "Access forbidden" => "پہنچ کی اجازت نہیں",
 "Cloud not found" => "نہیں مل سکا",
-"Edit categories" => "زمرہ جات کی تدوین کریں",
-"Add" => "شامل کریں",
 "Create an <strong>admin account</strong>" => "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں",
 "Advanced" => "ایڈوانسڈ",
 "Data folder" => "ڈیٹا فولڈر",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 2e3d9569357fc5b5ff3dc30fbae36a9b29229d21..9d335e4427a0e12e99af1b2841dcc817112ae8fd 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -1,14 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "group" => "nhóm",
-"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: %s" => "Danh mục này đã tồn tại: %s",
-"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.",
-"No categories selected for deletion." => "Bạn chưa chọn mục để xóa",
-"Error removing %s from favorites." => "Lỗi xóa %s từ mục yêu thích.",
 "Sunday" => "Chủ nhật",
 "Monday" => "Thứ 2",
 "Tuesday" => "Thứ 3",
@@ -46,12 +38,9 @@ $TRANSLATIONS = array(
 "Ok" => "Đồng ý",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
 "Cancel" => "Hủy",
-"The object type is not specified." => "Loại đối tượng không được chỉ định.",
-"Error" => "Lỗi",
-"The app name is not specified." => "Tên ứng dụng không được chỉ định.",
-"The required file {file} is not installed!" => "Tập tin cần thiết {file} không được cài đặt!",
 "Shared" => "Được chia sẻ",
 "Share" => "Chia sẻ",
+"Error" => "Lỗi",
 "Error while sharing" => "Lỗi trong quá trình chia sẻ",
 "Error while unsharing" => "Lỗi trong quá trình gỡ chia sẻ",
 "Error while changing permissions" => "Lỗi trong quá trình phân quyền",
@@ -82,6 +71,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "Đang gởi ...",
 "Email sent" => "Email đã được gửi",
 "Warning" => "Cảnh báo",
+"The object type is not specified." => "Loại đối tượng không được chỉ định.",
+"Delete" => "Xóa",
+"Add" => "Thêm",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Cập nhật không thành công . Vui lòng thông báo đến <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\"> Cộng đồng ownCloud </a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.",
 "Use the following link to reset your password: {link}" => "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}",
@@ -101,8 +93,6 @@ $TRANSLATIONS = array(
 "Help" => "Giúp đỡ",
 "Access forbidden" => "Truy cập bị cấm",
 "Cloud not found" => "Không tìm thấy Clound",
-"Edit categories" => "Sửa chuyên mục",
-"Add" => "Thêm",
 "Security Warning" => "Cảnh bảo bảo mật",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Phiên bản PHP của bạn có lỗ hổng NULL Byte attack (CVE-2006-7243)",
 "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.",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 6a5dcb50a95e6d2f11af707ca66c769986e23e4d..727daccad059b86038bfca32454f8c767d90cc99 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -8,14 +8,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "正在更新文件缓存,这可能需要较长时间...",
 "Updated filecache" => "文件缓存已更新",
 "... %d%% done ..." => "...已完成 %d%% ...",
-"Category type not provided." => "未提供分类类型。",
-"No category to add?" => "没有可添加分类?",
-"This category already exists: %s" => "此分类已存在:%s",
-"Object type not provided." => "未提供对象类型。",
-"%s ID not provided." => "%s ID未提供。",
-"Error adding %s to favorites." => "向收藏夹中新增%s时出错。",
-"No categories selected for deletion." => "没有选择要删除的类别",
-"Error removing %s from favorites." => "从收藏夹中移除%s时出错。",
 "Sunday" => "星期日",
 "Monday" => "星期一",
 "Tuesday" => "星期二",
@@ -53,12 +45,9 @@ $TRANSLATIONS = array(
 "Ok" => "好",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
 "Cancel" => "取消",
-"The object type is not specified." => "未指定对象类型。",
-"Error" => "错误",
-"The app name is not specified." => "未指定应用名称。",
-"The required file {file} is not installed!" => "所需文件{file}未安装!",
 "Shared" => "已共享",
 "Share" => "分享",
+"Error" => "错误",
 "Error while sharing" => "共享时出错",
 "Error while unsharing" => "取消共享时出错",
 "Error while changing permissions" => "修改权限时出错",
@@ -90,6 +79,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "正在发送...",
 "Email sent" => "邮件已发送",
 "Warning" => "警告",
+"The object type is not specified." => "未指定对象类型。",
+"Delete" => "删除",
+"Add" => "增加",
 "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。",
 "%s password reset" => "重置 %s 的密码",
@@ -112,8 +104,6 @@ $TRANSLATIONS = array(
 "Help" => "帮助",
 "Access forbidden" => "访问禁止",
 "Cloud not found" => "未找到云",
-"Edit categories" => "编辑分类",
-"Add" => "增加",
 "Security Warning" => "安全警告",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "你的PHP版本容易受到空字节攻击 (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "为保证安全使用 %s 请更新您的PHP。",
diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php
index f6c4003af616cb95205d97a23dbae7d2137bffcf..50caa86a2f20c16989c47d2547e32a8b2002e7be 100644
--- a/core/l10n/zh_HK.php
+++ b/core/l10n/zh_HK.php
@@ -33,9 +33,9 @@ $TRANSLATIONS = array(
 "Ok" => "OK",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
 "Cancel" => "取消",
-"Error" => "錯誤",
 "Shared" => "已分享",
 "Share" => "分享",
+"Error" => "錯誤",
 "Error while sharing" => "分享時發生錯誤",
 "Error while unsharing" => "取消分享時發生錯誤",
 "Error while changing permissions" => "更改權限時發生錯誤",
@@ -58,6 +58,8 @@ $TRANSLATIONS = array(
 "Password protected" => "密碼保護",
 "Sending ..." => "傳送中",
 "Email sent" => "郵件已傳",
+"Delete" => "刪除",
+"Add" => "加入",
 "The update was successful. Redirecting you to ownCloud now." => "更新成功, 正",
 "Use the following link to reset your password: {link}" => "請用以下連結重設你的密碼: {link}",
 "You will receive a link to reset your password via Email." => "你將收到一封電郵",
@@ -73,7 +75,6 @@ $TRANSLATIONS = array(
 "Admin" => "管理",
 "Help" => "幫助",
 "Cloud not found" => "未找到Cloud",
-"Add" => "加入",
 "Create an <strong>admin account</strong>" => "建立管理員帳戶",
 "Advanced" => "進階",
 "Configure the database" => "設定資料庫",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 1483329bbfd1afbf30fd268bbd416415488c6ce5..0cb4967b2b5e50a63d7db64c36ddd8124652aac5 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -9,14 +9,6 @@ $TRANSLATIONS = array(
 "Updating filecache, this may take really long..." => "更新檔案快取,這可能要很久…",
 "Updated filecache" => "已更新檔案快取",
 "... %d%% done ..." => "已完成 %d%%",
-"Category type not provided." => "未提供分類類型。",
-"No category to add?" => "沒有可增加的分類?",
-"This category already exists: %s" => "分類已經存在:%s",
-"Object type not provided." => "未指定物件類型",
-"%s ID not provided." => "未提供 %s ID 。",
-"Error adding %s to favorites." => "加入 %s 到最愛時發生錯誤。",
-"No categories selected for deletion." => "沒有選擇要刪除的分類。",
-"Error removing %s from favorites." => "從最愛移除 %s 時發生錯誤。",
 "No image or file provided" => "未提供圖片或檔案",
 "Unknown filetype" => "未知的檔案類型",
 "Invalid image" => "無效的圖片",
@@ -68,12 +60,9 @@ $TRANSLATIONS = array(
 "(all selected)" => "(已全選)",
 "({count} selected)" => "(已選 {count} 項)",
 "Error loading file exists template" => "載入檔案存在樣板出錯",
-"The object type is not specified." => "未指定物件類型。",
-"Error" => "錯誤",
-"The app name is not specified." => "沒有指定 app 名稱。",
-"The required file {file} is not installed!" => "沒有安裝所需的檔案 {file} !",
 "Shared" => "已分享",
 "Share" => "分享",
+"Error" => "錯誤",
 "Error while sharing" => "分享時發生錯誤",
 "Error while unsharing" => "取消分享時發生錯誤",
 "Error while changing permissions" => "修改權限時發生錯誤",
@@ -106,6 +95,9 @@ $TRANSLATIONS = array(
 "Sending ..." => "正在傳送…",
 "Email sent" => "Email 已寄出",
 "Warning" => "警告",
+"The object type is not specified." => "未指定物件類型。",
+"Delete" => "刪除",
+"Add" => "增加",
 "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 。",
 "%s password reset" => "%s 密碼重設",
@@ -131,8 +123,6 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "嗨,\n\n%s 和你分享了 %s ,到這裡看它:%s\n",
 "The share will expire on %s.\n\n" => "分享將於 %s 過期\n",
 "Cheers!" => "太棒了!",
-"Edit categories" => "編輯分類",
-"Add" => "增加",
 "Security Warning" => "安全性警告",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "您的 PHP 版本無法抵抗 NULL Byte 攻擊 (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "請更新 PHP 以安全地使用 %s。",
diff --git a/core/routes.php b/core/routes.php
index 57e25c0f1f7371576aeeece169f8225941b2d116..5009243d59f6e5f229bb467f7d261958c927325a 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -23,19 +23,43 @@ $this->create('core_ajax_share', '/core/ajax/share.php')
 // Translations
 $this->create('core_ajax_translations', '/core/ajax/translations.php')
 	->actionInclude('core/ajax/translations.php');
-// VCategories
-$this->create('core_ajax_vcategories_add', '/core/ajax/vcategories/add.php')
-	->actionInclude('core/ajax/vcategories/add.php');
-$this->create('core_ajax_vcategories_delete', '/core/ajax/vcategories/delete.php')
-	->actionInclude('core/ajax/vcategories/delete.php');
-$this->create('core_ajax_vcategories_addtofavorites', '/core/ajax/vcategories/addToFavorites.php')
-	->actionInclude('core/ajax/vcategories/addToFavorites.php');
-$this->create('core_ajax_vcategories_removefromfavorites', '/core/ajax/vcategories/removeFromFavorites.php')
-	->actionInclude('core/ajax/vcategories/removeFromFavorites.php');
-$this->create('core_ajax_vcategories_favorites', '/core/ajax/vcategories/favorites.php')
-	->actionInclude('core/ajax/vcategories/favorites.php');
-$this->create('core_ajax_vcategories_edit', '/core/ajax/vcategories/edit.php')
-	->actionInclude('core/ajax/vcategories/edit.php');
+// Tags
+$this->create('core_tags_tags', '/tags/{type}')
+	->get()
+	->action('OC\Core\Tags\Controller', 'getTags')
+	->requirements(array('type'));
+$this->create('core_tags_favorites', '/tags/{type}/favorites')
+	->get()
+	->action('OC\Core\Tags\Controller', 'getFavorites')
+	->requirements(array('type'));
+$this->create('core_tags_ids_for_tag', '/tags/{type}/ids')
+	->get()
+	->action('OC\Core\Tags\Controller', 'getIdsForTag')
+	->requirements(array('type'));
+$this->create('core_tags_favorite', '/tags/{type}/favorite/{id}/')
+	->post()
+	->action('OC\Core\Tags\Controller', 'favorite')
+	->requirements(array('type', 'id'));
+$this->create('core_tags_unfavorite', '/tags/{type}/unfavorite/{id}/')
+	->post()
+	->action('OC\Core\Tags\Controller', 'unFavorite')
+	->requirements(array('type', 'id'));
+$this->create('core_tags_tag', '/tags/{type}/tag/{id}/')
+	->post()
+	->action('OC\Core\Tags\Controller', 'tagAs')
+	->requirements(array('type', 'id'));
+$this->create('core_tags_untag', '/tags/{type}/untag/{id}/')
+	->post()
+	->action('OC\Core\Tags\Controller', 'unTag')
+	->requirements(array('type', 'id'));
+$this->create('core_tags_add', '/tags/{type}/add')
+	->post()
+	->action('OC\Core\Tags\Controller', 'addTag')
+	->requirements(array('type'));
+$this->create('core_tags_delete', '/tags/{type}/delete')
+	->post()
+	->action('OC\Core\Tags\Controller', 'deleteTags')
+	->requirements(array('type'));
 // oC JS config
 $this->create('js_config', '/core/js/config.js')
 	->actionInclude('core/js/config.php');
diff --git a/core/tags/controller.php b/core/tags/controller.php
new file mode 100644
index 0000000000000000000000000000000000000000..c790d43345d716ab56f4d35e49b7f0d8034cd8d4
--- /dev/null
+++ b/core/tags/controller.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas Tanghus (thomas@tanghus.net)
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Core\Tags;
+
+class Controller {
+	protected static function getTagger($type) {
+		\OC_JSON::checkLoggedIn();
+		\OC_JSON::callCheck();
+
+		try {
+			$tagger = \OC::$server->getTagManager()->load($type);
+			return $tagger;
+		} catch(\Exception $e) {
+			\OCP\Util::writeLog('core', __METHOD__ . ' Exception: ' . $e->getMessage(), \OCP\Util::ERROR);
+			$l = new \OC_L10n('core');
+			\OC_JSON::error(array('message'=> $l->t('Error loading tags')));
+			exit;
+		}
+	}
+
+	public static function getTags($args) {
+		$tagger = self::getTagger($args['type']);
+		\OC_JSON::success(array('tags'=> $tagger->getTags()));
+	}
+
+	public static function getFavorites($args) {
+		$tagger = self::getTagger($args['type']);
+		\OC_JSON::success(array('ids'=> $tagger->getFavorites()));
+	}
+
+	public static function getIdsForTag($args) {
+		$tagger = self::getTagger($args['type']);
+		\OC_JSON::success(array('ids'=> $tagger->getIdsForTag($_GET['tag'])));
+	}
+
+	public static function addTag($args) {
+		$tagger = self::getTagger($args['type']);
+
+		$id = $tagger->add(strip_tags($_POST['tag']));
+		if($id === false) {
+			$l = new \OC_L10n('core');
+			\OC_JSON::error(array('message'=> $l->t('Tag already exists')));
+		} else {
+			\OC_JSON::success(array('id'=> $id));
+		}
+	}
+
+	public static function deleteTags($args) {
+		$tags = $_POST['tags'];
+		if(!is_array($tags)) {
+			$tags = array($tags);
+		}
+
+		$tagger = self::getTagger($args['type']);
+
+		if(!$tagger->delete($tags)) {
+			$l = new \OC_L10n('core');
+			\OC_JSON::error(array('message'=> $l->t('Error deleting tag(s)')));
+		} else {
+			\OC_JSON::success();
+		}
+	}
+
+	public static function tagAs($args) {
+		$tagger = self::getTagger($args['type']);
+
+		if(!$tagger->tagAs($args['id'], $_POST['tag'])) {
+			$l = new \OC_L10n('core');
+			\OC_JSON::error(array('message'=> $l->t('Error tagging')));
+		} else {
+			\OC_JSON::success();
+		}
+	}
+
+	public static function unTag($args) {
+		$tagger = self::getTagger($args['type']);
+
+		if(!$tagger->unTag($args['id'], $_POST['tag'])) {
+			$l = new \OC_L10n('core');
+			\OC_JSON::error(array('message'=> $l->t('Error untagging')));
+		} else {
+			\OC_JSON::success();
+		}
+	}
+
+	public static function favorite($args) {
+		$tagger = self::getTagger($args['type']);
+
+		if(!$tagger->addToFavorites($args['id'])) {
+			$l = new \OC_L10n('core');
+			\OC_JSON::error(array('message'=> $l->t('Error favoriting')));
+		} else {
+			\OC_JSON::success();
+		}
+	}
+
+	public static function unFavorite($args) {
+		$tagger = self::getTagger($args['type']);
+
+		if(!$tagger->removeFromFavorites($args['id'])) {
+			$l = new \OC_L10n('core');
+			\OC_JSON::error(array('message'=> $l->t('Error unfavoriting')));
+		} else {
+			\OC_JSON::success();
+		}
+	}
+
+}
diff --git a/core/templates/edit_categories_dialog.php b/core/templates/edit_categories_dialog.php
deleted file mode 100644
index ea155bdf0ba3532456f5a83e54eafeb624d23e08..0000000000000000000000000000000000000000
--- a/core/templates/edit_categories_dialog.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-$categories = isset($_['categories'])?$_['categories']:array();
-?>
-<div id="edit_categories_dialog" title="<?php p($l->t('Edit categories')); ?>">
-<!-- ?php print_r($types); ? -->
-	<form method="post" id="categoryform">
-	<div class="scrollarea">
-	<ul id="categorylist">
-	<?php foreach($categories as $category): ?>
-	<li><input type="checkbox" name="categories[]" value="<?php p($category); ?>" /><?php p($category); ?></li>
-	<?php endforeach; ?>
-	</ul>
-	</div>
-	<div class="bottombuttons">
-		<input type="text" id="category_addinput" name="category" />
-		<button id="category_addbutton" disabled="disabled"><?php p($l->t('Add')); ?></button>
-	</div>
-	</form>
-</div>
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 5a103762269ffbb4a79987caf49cec5f0bbf6689..a6f55cb0e288ec173a7f40bb11f75d3fbe85d407 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -61,13 +61,13 @@
 		</p>
 	</fieldset>
 
-	<?php if(!$_['directoryIsSet'] OR !$_['dbIsSet']): ?>
+	<?php if(!$_['directoryIsSet'] OR !$_['dbIsSet'] OR count($_['errors']) > 0): ?>
 	<fieldset id="advancedHeader">
 		<legend><a id="showAdvanced"><?php p($l->t( 'Advanced' )); ?> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a></legend>
 	</fieldset>
 	<?php endif; ?>
 
-	<?php if(!$_['directoryIsSet']): ?>
+	<?php if(!$_['directoryIsSet'] OR count($_['errors']) > 0): ?>
 	<fieldset id="datadirField">
 		<div id="datadirContent">
 			<label for="directory"><?php p($l->t( 'Data folder' )); ?></label>
@@ -78,7 +78,7 @@
 	</fieldset>
 	<?php endif; ?>
 
-	<?php if(!$_['dbIsSet']): ?>
+	<?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
 	<fieldset id='databaseField'>
 		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'] or $_['hasMSSQL'])
 			$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index ea10c3042b592f7f192d9723be89e68493a14e6e..8cd237deea1c57aad08712e746d10ce1b2ef19a7 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -11,6 +11,7 @@
 		<?php p($theme->getTitle()); ?>
 		</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
 		<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" />
 		<?php foreach ($_['cssfiles'] as $cssfile): ?>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 9c9eb63382fff615bb93777b226c6570f94e9e89..47ca5903dab9098e655dbcb8309f7895e8988358 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -11,6 +11,7 @@
 		<?php p($theme->getTitle()); ?>
 		</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<meta name="apple-itunes-app" content="app-id=543672169">
 		<link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
 		<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" />
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index fcca43624fe6ad4b4aee8a67935a526952c6a78a..d30313a67cc5471421d916c3a625120dc7007219 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -14,6 +14,7 @@
 		</title>
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<meta name="apple-itunes-app" content="app-id=543672169">
 		<link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
 		<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" />
diff --git a/core/templates/tags.html b/core/templates/tags.html
new file mode 100644
index 0000000000000000000000000000000000000000..ae3d072b381eea1970d218522d0cb3ea2feca876
--- /dev/null
+++ b/core/templates/tags.html
@@ -0,0 +1,14 @@
+<div id="tagsdialog">
+	<div class="content">
+		<div class="scrollarea">
+			<ul class="taglist">
+				<li><input type="checkbox" name="ids[]" id="tag_{id}" value="{name}" />
+					<label for="tag_{id}">{name}</label>
+				</li>
+			</ul>
+		</div>
+		<div class="bottombuttons">
+			<input type="text" class="addinput" name="tag" placeholder="{addText}" />
+		</div>
+	</div>
+</div>
diff --git a/l10n/ach/core.po b/l10n/ach/core.po
index 0c166220d477464b196673993a436ee594ef2e96..aeeb7265154b59959f3f554b7b4c2370536d84cf 100644
--- a/l10n/ach/core.po
+++ b/l10n/ach/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
 "MIME-Version: 1.0\n"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -311,27 +272,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -340,7 +280,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr ""
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -372,7 +317,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr ""
 
@@ -444,30 +389,58 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -504,7 +477,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr ""
 
@@ -548,7 +521,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr ""
 
@@ -560,6 +533,34 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -589,14 +590,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr ""
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -686,12 +679,12 @@ msgstr ""
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr ""
 
@@ -709,19 +702,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ach/files_encryption.po b/l10n/ach/files_encryption.po
index 5dfafa4f3b892d2632f45e8ed97fca7f73129a2f..ffedb63bfb29a3ef0f2c98dc474b25f41dc7d9ba 100644
--- a/l10n/ach/files_encryption.po
+++ b/l10n/ach/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
 "MIME-Version: 1.0\n"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ach/files_sharing.po b/l10n/ach/files_sharing.po
index a6aa642bca6eef26a044405f4f83c96f91a169df..aeebd1b020c9a39dee70d46848a4835b0f7b3ed2 100644
--- a/l10n/ach/files_sharing.po
+++ b/l10n/ach/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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
-msgid "Password"
+msgid "The password is wrong. Try again."
 msgstr ""
 
-#: templates/authenticate.php:9
-msgid "Submit"
+#: templates/authenticate.php:10
+msgid "Password"
 msgstr ""
 
 #: templates/part.404.php:3
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/ach/files_trashbin.po b/l10n/ach/files_trashbin.po
index 327f892ea05e9bb711c58a3faea0436fe8886671..1eeccfe967462b888c69733adf2f1721e8e7e00e 100644
--- a/l10n/ach/files_trashbin.po
+++ b/l10n/ach/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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
 "MIME-Version: 1.0\n"
@@ -27,55 +27,31 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:37
-msgid "delete file permanently"
+#: lib/trashbin.php:814 lib/trashbin.php:816
+msgid "restored"
 msgstr ""
 
-#: js/trash.js:129
-msgid "Delete permanently"
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: js/trash.js:184 templates/index.php:17
+#: templates/index.php:23
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:185 templates/index.php:27
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:193
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:199
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/trash.php:814 lib/trash.php:816
-msgid "restored"
-msgstr ""
-
-#: templates/index.php:9
-msgid "Nothing in here. Your trash bin is empty!"
+#: templates/index.php:26 templates/index.php:28
+msgid "Restore"
 msgstr ""
 
-#: templates/index.php:20 templates/index.php:22
-msgid "Restore"
+#: templates/index.php:34
+msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:30 templates/index.php:31
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr ""
 
diff --git a/l10n/ach/user_ldap.po b/l10n/ach/user_ldap.po
index 8c2514234b3303e0ad50bc7a99a7b9749996090b..3c13f155eef9407628eac826376284284b0e54fc 100644
--- a/l10n/ach/user_ldap.po
+++ b/l10n/ach/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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
 "MIME-Version: 1.0\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:36
+#: ajax/testConfiguration.php:37
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:39
+#: ajax/testConfiguration.php:40
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:43
+#: ajax/testConfiguration.php:44
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr ""
diff --git a/l10n/ady/core.po b/l10n/ady/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..9fbbc62f1a82617bc1f6a98e9130036fe0c126c4
--- /dev/null
+++ b/l10n/ady/core.po
@@ -0,0 +1,744 @@
+# 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-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ady\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:118 ajax/share.php:197
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: ajax/share.php:168
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/share.php:327
+msgid "group"
+msgstr ""
+
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr ""
+
+#: ajax/update.php:20
+msgid "Updating filecache, this may take really long..."
+msgstr ""
+
+#: ajax/update.php:23
+msgid "Updated filecache"
+msgstr ""
+
+#: ajax/update.php:26
+#, php-format
+msgid "... %d%% done ..."
+msgstr ""
+
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
+#: js/config.php:32
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:33
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:34
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:35
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:36
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:37
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:38
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:43
+msgid "January"
+msgstr ""
+
+#: js/config.php:44
+msgid "February"
+msgstr ""
+
+#: js/config.php:45
+msgid "March"
+msgstr ""
+
+#: js/config.php:46
+msgid "April"
+msgstr ""
+
+#: js/config.php:47
+msgid "May"
+msgstr ""
+
+#: js/config.php:48
+msgid "June"
+msgstr ""
+
+#: js/config.php:49
+msgid "July"
+msgstr ""
+
+#: js/config.php:50
+msgid "August"
+msgstr ""
+
+#: js/config.php:51
+msgid "September"
+msgstr ""
+
+#: js/config.php:52
+msgid "October"
+msgstr ""
+
+#: js/config.php:53
+msgid "November"
+msgstr ""
+
+#: js/config.php:54
+msgid "December"
+msgstr ""
+
+#: js/js.js:387
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:866
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:867
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:868
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:869
+msgid "today"
+msgstr ""
+
+#: js/js.js:870
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:871
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:872
+msgid "last month"
+msgstr ""
+
+#: js/js.js:873
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:874
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:875
+msgid "last year"
+msgstr ""
+
+#: js/js.js:876
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:172
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:182
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:199
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
+#: js/share.js:30 js/share.js:45 js/share.js:87
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:90
+msgid "Share"
+msgstr ""
+
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr ""
+
+#: js/share.js:132 js/share.js:707
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:143
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:150
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:159
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:161
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:184
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:189
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:192
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
+msgid "Password"
+msgstr ""
+
+#: js/share.js:199
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:203
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:204
+msgid "Send"
+msgstr ""
+
+#: js/share.js:209
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:210
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:243
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:246
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:284
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:320
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:341
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:353
+msgid "notify user by email"
+msgstr ""
+
+#: js/share.js:361
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:363
+msgid "access control"
+msgstr ""
+
+#: js/share.js:366
+msgid "create"
+msgstr ""
+
+#: js/share.js:369
+msgid "update"
+msgstr ""
+
+#: js/share.js:372
+msgid "delete"
+msgstr ""
+
+#: js/share.js:375
+msgid "share"
+msgstr ""
+
+#: js/share.js:409 js/share.js:654
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:667
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:679
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:694
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:705
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:729
+msgid "Warning"
+msgstr ""
+
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
+#: js/update.js:17
+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:21
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:62
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:4
+msgid ""
+"The link to reset your password has been sent to your email.<br>If you do "
+"not receive it within a reasonable amount of time, check your spam/junk "
+"folders.<br>If it is not there ask your local administrator ."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: templates/login.php:25
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:22
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
+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 templates/layout.user.php:109
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:15
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+msgstr ""
+
+#: templates/altmail.php:4
+#, php-format
+msgid ""
+"The share will expire on %s.\n"
+"\n"
+msgstr ""
+
+#: templates/altmail.php:6 templates/mail.php:19
+msgid "Cheers!"
+msgstr ""
+
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:26
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:32
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:33
+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:39
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:41
+#, php-format
+msgid ""
+"For information how to properly configure your server, please see the <a "
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
+
+#: templates/installation.php:47
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:66
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:73
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:85
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:90 templates/installation.php:102
+#: templates/installation.php:113 templates/installation.php:124
+#: templates/installation.php:136
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:148
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:155
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:160
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:168
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:175
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:184
+msgid "Finish setup"
+msgstr ""
+
+#: templates/installation.php:184
+msgid "Finishing …"
+msgstr ""
+
+#: templates/layout.user.php:42
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:70
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:9
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:10
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:12
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:43
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:46
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:52
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>"
+msgstr ""
+
+#: templates/mail.php:17
+#, php-format
+msgid "The share will expire on %s.<br><br>"
+msgstr ""
+
+#: templates/update.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
+msgstr ""
diff --git a/l10n/ady/files.po b/l10n/ady/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..aff7006c56830f9bf220ea7c2fd1d1cfb7d18bce
--- /dev/null
+++ b/l10n/ady/files.po
@@ -0,0 +1,356 @@
+# 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-10-07 12:14-0400\n"
+"PO-Revision-Date: 2013-10-07 15:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ady\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/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:66
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:67
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:69
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:70
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:71
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:72
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:73
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:91
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Files"
+msgstr ""
+
+#: js/file-upload.js:224
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:235
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:302
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:336
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:426
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:500
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:505 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:537 js/file-upload.js:553 js/files.js:518 js/files.js:556
+msgid "Error"
+msgstr ""
+
+#: js/fileactions.js:119
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:131
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:184
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:416 js/filelist.js:418
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/filelist.js:416 js/filelist.js:418
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:416
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:416 js/filelist.js:418
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:463
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
+
+#: js/filelist.js:463
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:541
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:731 js/filelist.js:769
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:25
+msgid "'.' is an invalid file name."
+msgstr ""
+
+#: js/files.js:29
+msgid "File name cannot be empty."
+msgstr ""
+
+#: js/files.js:37
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: js/files.js:51
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:55
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:68
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:72
+msgid ""
+"Invalid private key for Encryption App. Please update your private key "
+"password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: js/files.js:76
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:307
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:518 js/files.js:556
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:569 templates/index.php:57
+msgid "Name"
+msgstr ""
+
+#: js/files.js:570 templates/index.php:69
+msgid "Size"
+msgstr ""
+
+#: js/files.js:571 templates/index.php:71
+msgid "Modified"
+msgstr ""
+
+#: lib/app.php:73
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:11 templates/index.php:17
+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:6
+msgid "New"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:13
+msgid "From link"
+msgstr ""
+
+#: templates/index.php:30
+msgid "Deleted files"
+msgstr ""
+
+#: templates/index.php:35
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:41
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:46
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:63
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:76 templates/index.php:77
+msgid "Unshare"
+msgstr ""
+
+#: templates/index.php:82 templates/index.php:83
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:96
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:98
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:103
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:106
+msgid "Current scanning"
+msgstr ""
+
+#: templates/upgrade.php:2
+msgid "Upgrading filesystem cache..."
+msgstr ""
diff --git a/l10n/ady/files_encryption.po b/l10n/ady/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..c7dad8117243fcf82854cf1ea8b014656f027df1
--- /dev/null
+++ b/l10n/ady/files_encryption.po
@@ -0,0 +1,197 @@
+# 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-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ady\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:52
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:54
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:12
+msgid ""
+"Encryption app not initialized! Maybe the encryption app was re-enabled "
+"during your session. Please try to log out and log back in to initialize the"
+" encryption app."
+msgstr ""
+
+#: files/error.php:15
+msgid ""
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
+#: hooks/hooks.php:53
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:54
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
+
+#: hooks/hooks.php:252
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/settings-admin.js:13
+msgid "Saving..."
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "Go directly to your "
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:7
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:11
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:14
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:40
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:47
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:53
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:58
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:12
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:22
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:28
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:33
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:42
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:44
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:60
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:61
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ady/files_external.po b/l10n/ady/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..9715fc2bc005d32cf96eb0663b20803d1b55e7ef
--- /dev/null
+++ b/l10n/ady/files_external.po
@@ -0,0 +1,123 @@
+# 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-10-07 12:16-0400\n"
+"PO-Revision-Date: 2013-10-07 15:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ady\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:65 js/google.js:86
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:101
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:42 js/google.js:121
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: lib/config.php:453
+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:457
+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 ""
+
+#: lib/config.php:460
+msgid ""
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
+"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
+"your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:90
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:100
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:129
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:130
+msgid "Allow users to mount their own external storage"
+msgstr ""
+
+#: templates/settings.php:141
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:159
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/ady/files_sharing.po b/l10n/ady/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..b243c28faa1511f5440c9d9111e8bd3787a29c82
--- /dev/null
+++ b/l10n/ady/files_sharing.po
@@ -0,0 +1,80 @@
+# 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-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ady\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
+msgid "Password"
+msgstr ""
+
+#: templates/part.404.php:3
+msgid "Sorry, this link doesn’t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:17
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:20
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:28 templates/public.php:94
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr ""
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:91
+msgid "No preview available for"
+msgstr ""
diff --git a/l10n/ady/files_trashbin.po b/l10n/ady/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..c8916178f73c34df34ae054a45e1a98e1f653fcb
--- /dev/null
+++ b/l10n/ady/files_trashbin.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-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ady\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:42
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:42
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:814 lib/trashbin.php:816
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:23
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:26 templates/index.php:28
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:34
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:37 templates/index.php:38
+msgid "Delete"
+msgstr ""
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/ady/files_versions.po b/l10n/ady/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..5e9e0e8f2a70e9af0fc0c50e2fabb307c787af30
--- /dev/null
+++ b/l10n/ady/files_versions.po
@@ -0,0 +1,43 @@
+# 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-10-07 12:16-0400\n"
+"PO-Revision-Date: 2013-10-07 15:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ady\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:7
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:147
+msgid "Restore"
+msgstr ""
diff --git a/l10n/ady/lib.po b/l10n/ady/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..94fa2ed8df7fde04800456015691cbf0c792a8ee
--- /dev/null
+++ b/l10n/ady/lib.po
@@ -0,0 +1,341 @@
+# 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-10-07 12:17-0400\n"
+"PO-Revision-Date: 2013-10-07 15:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ady\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: private/app.php:237
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: private/app.php:248
+msgid "No app name specified"
+msgstr ""
+
+#: private/app.php:352
+msgid "Help"
+msgstr ""
+
+#: private/app.php:365
+msgid "Personal"
+msgstr ""
+
+#: private/app.php:376
+msgid "Settings"
+msgstr ""
+
+#: private/app.php:388
+msgid "Users"
+msgstr ""
+
+#: private/app.php:401
+msgid "Admin"
+msgstr ""
+
+#: private/app.php:832
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: private/avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: private/avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: private/avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
+#: private/defaults.php:36
+msgid "web services under your control"
+msgstr ""
+
+#: private/files.php:66 private/files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: private/files.php:226
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:227
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:228 private/files.php:256
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:253
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: private/installer.php:63
+msgid "No source specified when installing app"
+msgstr ""
+
+#: private/installer.php:70
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: private/installer.php:75
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: private/installer.php:89
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: private/installer.php:103
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: private/installer.php:125
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: private/installer.php:131
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: private/installer.php:140
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: private/installer.php:146
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: private/installer.php:152
+msgid ""
+"App can't be installed because the version in info.xml/version is not the "
+"same as the version reported from the app store"
+msgstr ""
+
+#: private/installer.php:162
+msgid "App directory already exists"
+msgstr ""
+
+#: private/installer.php:175
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: private/json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: private/json.php:39 private/json.php:62 private/json.php:73
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
+msgid "Files"
+msgstr ""
+
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
+msgid "Text"
+msgstr ""
+
+#: private/search/provider/file.php:30
+msgid "Images"
+msgstr ""
+
+#: private/setup/abstractdatabase.php:22
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:25
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:28
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: private/setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:24
+#: private/setup/postgresql.php:70
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: private/setup/mysql.php:12
+msgid "MySQL username and/or password not valid"
+msgstr ""
+
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:147
+#: private/setup/oci.php:154 private/setup/oci.php:165
+#: private/setup/oci.php:172 private/setup/oci.php:181
+#: private/setup/oci.php:189 private/setup/oci.php:198
+#: private/setup/oci.php:204 private/setup/postgresql.php:89
+#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
+#: private/setup/postgresql.php:125 private/setup/postgresql.php:134
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:148
+#: private/setup/oci.php:155 private/setup/oci.php:166
+#: private/setup/oci.php:182 private/setup/oci.php:190
+#: private/setup/oci.php:199 private/setup/postgresql.php:90
+#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
+#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:85
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: private/setup/mysql.php:86
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: private/setup/mysql.php:91
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: private/setup/mysql.php:92
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: private/setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: private/setup/oci.php:41 private/setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: private/setup/oci.php:173 private/setup/oci.php:205
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: private/setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: private/setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: private/setup.php:184
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: private/setup.php:185
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/tags.php:194
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:122
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:123
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:124
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:125
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:126
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:128
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:130
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:131
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:133
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "years ago"
+msgstr ""
+
+#: private/template.php:297
+msgid "Caused by:"
+msgstr ""
diff --git a/l10n/ady/settings.po b/l10n/ady/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..6a7e861752671dda1be171eec52c47d2e17e894b
--- /dev/null
+++ b/l10n/ady/settings.po
@@ -0,0 +1,609 @@
+# 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-10-07 12:17-0400\n"
+"PO-Revision-Date: 2013-10-07 15:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ady\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:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+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/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:25
+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:30
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:36
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
+#: js/apps.js:43
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:71
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:125
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:128
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:128
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:129 templates/apps.php:43
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:132
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:225
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:270
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:292
+msgid "Saving..."
+msgstr ""
+
+#: js/users.js:47
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:47
+msgid "undo"
+msgstr ""
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:95 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:100 templates/users.php:92 templates/users.php:130
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:123 templates/users.php:170
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:280
+msgid "add group"
+msgstr ""
+
+#: js/users.js:442
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:443 js/users.js:449 js/users.js:464
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:448
+msgid "A valid password must be provided"
+msgstr ""
+
+#: personal.php:45 personal.php:46
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:18
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file 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 ""
+
+#: templates/admin.php:29
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:32
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: templates/admin.php:33
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:47
+msgid ""
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
+"module to get best results with mime-type detection."
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:63
+#, php-format
+msgid ""
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
+
+#: templates/admin.php:75
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:78
+msgid ""
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps don´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:99
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:107
+msgid ""
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
+
+#: templates/admin.php:115
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
+
+#: templates/admin.php:120
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:126
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:127
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:134
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:135
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:143
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:144
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:152
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:153
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:160
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:163
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:170
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:171
+msgid "Allow user to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:178
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:191
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:199
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:211
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:212
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:243
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:244
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:250 templates/personal.php:161
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:254 templates/personal.php:164
+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/apps.php:13
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:33
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:39
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:41
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: templates/help.php:6
+msgid "Administrator Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Forum"
+msgstr ""
+
+#: templates/help.php:14
+msgid "Bugtracker"
+msgstr ""
+
+#: templates/help.php:17
+msgid "Commercial Support"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "Get the apps to sync your files"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:27
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:41
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:44
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:58 templates/users.php:88
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:73
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:75
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:127
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
+
+#: templates/personal.php:138
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:140
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:146
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:151
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/users.php:21
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:30
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:36
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:48 templates/users.php:148
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:66 templates/users.php:163
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:87
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:94
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:108
+msgid "change display name"
+msgstr ""
+
+#: templates/users.php:112
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:143
+msgid "Default"
+msgstr ""
diff --git a/l10n/ady/user_ldap.po b/l10n/ady/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..2548c7e3eae96e567ac1bd8cb31f2d442ad86e21
--- /dev/null
+++ b/l10n/ady/user_ldap.po
@@ -0,0 +1,410 @@
+# 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-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ady\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:37
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:40
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:44
+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:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:146
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:156
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:157
+msgid "Confirm Deletion"
+msgstr ""
+
+#: templates/settings.php:9
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behavior. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:12
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:16
+msgid "Server configuration"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:46
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:50
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:51
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:54
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:55
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
+
+#: templates/settings.php:66
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:68
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:68
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:70
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:70
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:71
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:72
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:72
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:73
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:73
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:74
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:75
+#, php-format
+msgid ""
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:78
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:81
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:81
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:82 templates/settings.php:85
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:84
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:84
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:90
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:93
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:98
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:99
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:100
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:101
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behavior. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
+msgid ""
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Help"
+msgstr ""
diff --git a/l10n/ady/user_webdavauth.po b/l10n/ady/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..d20828e05ef807db1d3e6d24d458a00ffc391804
--- /dev/null
+++ b/l10n/ady/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-10-07 12:16-0400\n"
+"PO-Revision-Date: 2013-10-07 15:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ady\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:7
+msgid ""
+"The user credentials will be sent to this address. 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/af_ZA/core.po b/l10n/af_ZA/core.po
index 252d6872d0e12923ac637d142aa62c410fa12766..1ddd721194760411706dd1d42ee1dbd543087103 100644
--- a/l10n/af_ZA/core.po
+++ b/l10n/af_ZA/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -311,27 +272,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -340,7 +280,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr ""
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -372,7 +317,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Wagwoord"
 
@@ -444,30 +389,58 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -504,7 +477,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Gebruikersnaam"
 
@@ -548,7 +521,7 @@ msgstr "Persoonlik"
 msgid "Users"
 msgstr "Gebruikers"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Toepassings"
 
@@ -560,6 +533,34 @@ msgstr "Admin"
 msgid "Help"
 msgstr "Hulp"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -589,14 +590,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr ""
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -686,12 +679,12 @@ msgstr "Maak opstelling klaar"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Teken uit"
 
@@ -709,19 +702,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Jou wagwoord verloor?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "onthou"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Teken aan"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/af_ZA/files_encryption.po b/l10n/af_ZA/files_encryption.po
index 69d909b76a3185af5b8adbc3b9bfa7e1e359cc84..0579f8861e644f668da248bcb7de126afea98726 100644
--- a/l10n/af_ZA/files_encryption.po
+++ b/l10n/af_ZA/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/af_ZA/files_sharing.po b/l10n/af_ZA/files_sharing.po
index 1aa1c35c8b1ee28915a194ba056806db07574b98..4b54e1192cb24cb2aa9bc5f538fb91b8cdf80e7f 100644
--- a/l10n/af_ZA/files_sharing.po
+++ b/l10n/af_ZA/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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -18,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Wagwoord"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr ""
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/af_ZA/files_trashbin.po b/l10n/af_ZA/files_trashbin.po
index 020abe02dd91b116e7d1bd9b06ba32f1c280efd2..4d4d4b186ec3c692c046fb57985cc62e3d855d8d 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-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -27,55 +27,31 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:100
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:36
-msgid "delete file permanently"
+#: lib/trashbin.php:814 lib/trashbin.php:816
+msgid "restored"
 msgstr ""
 
-#: js/trash.js:127
-msgid "Delete permanently"
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: js/trash.js:182 templates/index.php:17
+#: templates/index.php:23
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:183 templates/index.php:27
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:191
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:197
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/trash.php:819 lib/trash.php:821
-msgid "restored"
-msgstr ""
-
-#: templates/index.php:9
-msgid "Nothing in here. Your trash bin is empty!"
+#: templates/index.php:26 templates/index.php:28
+msgid "Restore"
 msgstr ""
 
-#: templates/index.php:20 templates/index.php:22
-msgid "Restore"
+#: templates/index.php:34
+msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:30 templates/index.php:31
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr ""
 
diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po
index 77d655e8a7ac171301c262c14eb7dcc1e3282a10..5d6c9799717c94567aad5f4ad5a2f2c9dc2f78cf 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Hulp"
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index c7d04d8d311368ad8374ae87bd35886aa3459667..59fa89f2005a4464cf3b827078c5e7db4be1edf3 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -57,45 +57,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 "هذا التصنيف موجود مسبقا :  %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "نوع العنصر لم يدخل"
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "رقم  %s لم يدخل"
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "خطأ في اضافة %s الى المفضلة"
-
-#: 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 "خطأ في حذف %s من المفضلة"
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -332,27 +293,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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 "الملف المطلوب {file} غير منصّب."
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "مشارك"
@@ -361,7 +301,12 @@ msgstr "مشارك"
 msgid "Share"
 msgstr "شارك"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "خطأ"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "حصل خطأ عند عملية المشاركة"
 
@@ -393,7 +338,7 @@ msgstr "شارك مع رابط"
 msgid "Password protect"
 msgstr "حماية كلمة السر"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "كلمة المرور"
 
@@ -465,30 +410,58 @@ msgstr "حذف"
 msgid "share"
 msgstr "مشاركة"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "محمي بكلمة السر"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "جاري الارسال ..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "تم ارسال البريد الالكتروني"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "تحذير"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "نوع العنصر غير محدد."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "إلغاء"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "اضف"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -525,7 +498,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "إسم المستخدم"
 
@@ -569,7 +542,7 @@ msgstr "شخصي"
 msgid "Users"
 msgstr "المستخدمين"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "التطبيقات"
 
@@ -581,6 +554,34 @@ msgstr "المدير"
 msgid "Help"
 msgstr "المساعدة"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "التوصّل محظور"
@@ -610,14 +611,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "عدل الفئات"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "اضف"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -707,12 +700,12 @@ msgstr "انهاء التعديلات"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "الخروج"
 
@@ -730,19 +723,27 @@ msgstr "قد يكون حسابك في خطر إن لم تقم بإعادة تع
 msgid "Please change your password to secure your account again."
 msgstr "الرجاء إعادة تعيين كلمة السر لتأمين حسابك."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "هل نسيت كلمة السر؟"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "تذكر"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "أدخل"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "اسماء دخول بديلة"
 
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 21d3340aca1391702c52f262d90307bfd1ba667c..62f4a5fc3702318127805d849b9318cad9e7c33d 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 19:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+0000\n"
 "Last-Translator: Meesh <M_almohimeed@yahoo.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -76,15 +76,15 @@ msgstr "خطأ في الكتابة على القرص الصلب"
 msgid "Not enough storage available"
 msgstr "لا يوجد مساحة تخزينية كافية"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr "فشلت عملية الرفع. تعذر الحصول على معلومات الملف."
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr "*فشلت علمية الرفع. تعذر إيجاد الملف الذي تم رفعه.\n*فشلت علمية التحميل. تعذر إيجاد الملف الذي تم تحميله."
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "مسار غير صحيح."
 
@@ -92,36 +92,36 @@ msgstr "مسار غير صحيح."
 msgid "Files"
 msgstr "الملفات"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "تعذر رفع الملف {filename} إما لأنه مجلد أو لان حجم الملف 0 بايت"
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "لا توجد مساحة كافية"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "تم إلغاء عملية رفع الملفات ."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr "تعذر الحصول على نتيجة من الخادم"
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "عنوان ال URL  لا يجوز أن يكون فارغا."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "تسمية ملف غير صالحة. استخدام الاسم \"shared\" محجوز بواسطة ownCloud"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "خطأ"
 
@@ -133,7 +133,7 @@ msgstr "شارك"
 msgid "Delete permanently"
 msgstr "حذف بشكل دائم"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "إعادة تسميه"
 
@@ -165,7 +165,7 @@ msgstr "استبدل {new_name}  بـ  {old_name}"
 msgid "undo"
 msgstr "تراجع"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "لا يوجد مجلدات %n"
@@ -175,7 +175,7 @@ msgstr[3] "عدد قليل من مجلدات %n"
 msgstr[4] "عدد كبير من مجلدات %n"
 msgstr[5] "مجلدات %n"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "لا يوجد ملفات %n"
@@ -240,25 +240,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "تم تعطيل التشفير لكن ملفاتك لا تزال مشفرة. فضلا اذهب إلى الإعدادات الشخصية لإزالة التشفير عن ملفاتك."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "حدث خطأ أثناء نقل الملف"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "اسم"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "حجم"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "معدل"
 
@@ -267,7 +267,7 @@ msgstr "معدل"
 msgid "%s could not be renamed"
 msgstr "%s  لا يمكن إعادة تسميته. "
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "رفع"
 
@@ -303,65 +303,65 @@ msgstr "الحد الأقصى المسموح به لملفات ZIP"
 msgid "Save"
 msgstr "حفظ"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "جديد"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "ملف"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "مجلد"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "من رابط"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "حذف الملفات"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "إلغاء رفع الملفات"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "لا تملك صلاحيات الكتابة هنا."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "لا يوجد شيء هنا. إرفع بعض الملفات!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "تحميل"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "إلغاء مشاركة"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "إلغاء"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "حجم الترفيع أعلى من المسموح"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "يرجى الانتظار , جاري فحص الملفات ."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "الفحص الحالي"
 
diff --git a/l10n/ar/files_encryption.po b/l10n/ar/files_encryption.po
index ead512918bb24fc58363b8e58a785adfcf243adb..75459ab8ed8e41e5fe7587be364bdd1905acbba0 100644
--- a/l10n/ar/files_encryption.po
+++ b/l10n/ar/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "التشفير"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ar/files_external.po b/l10n/ar/files_external.po
index b931dc9eae8cd8f34394e0c41fac898e506e4a65..a20b34259f7271da355c8b67015a35d526d4ffd6 100644
--- a/l10n/ar/files_external.po
+++ b/l10n/ar/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Meesh <M_almohimeed@yahoo.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-01 18:37+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-09 02:00+0000\n"
+"Last-Translator: Meesh <M_almohimeed@yahoo.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,7 +64,7 @@ msgstr ""
 
 #: templates/settings.php:9 templates/settings.php:28
 msgid "Folder name"
-msgstr ""
+msgstr "اسم المجلد"
 
 #: templates/settings.php:10
 msgid "External storage"
@@ -91,7 +92,7 @@ msgstr ""
 
 #: templates/settings.php:91
 msgid "All Users"
-msgstr ""
+msgstr "كل المستخدمين"
 
 #: templates/settings.php:92
 msgid "Groups"
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index df2684b93db32385abb7beb322abfc3880ccb511..a0c36d0049db2d031cca7e771e0b16740a774bc6 100644
--- a/l10n/ar/files_sharing.po
+++ b/l10n/ar/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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,17 +18,17 @@ msgstr ""
 "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"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "كلمة المرور"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "تطبيق"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s شارك المجلد %s معك"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s شارك الملف %s معك"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "تحميل"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "رفع"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "إلغاء رفع الملفات"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "لا يوجد عرض مسبق لـ"
diff --git a/l10n/ar/files_trashbin.po b/l10n/ar/files_trashbin.po
index 9edd1eb64d339739bef2fcc9ceb8ee5db6241aa8..3c6544d35f986848b06f8a4b6575e577a7478249 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 19:20+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -27,50 +27,10 @@ msgstr "تعذّر حذف%s بشكل دائم"
 msgid "Couldn't restore %s"
 msgstr "تعذّر استرجاع %s "
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "إبدء عملية الإستعادة"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "خطأ"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "حذف بشكل دائم"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "حذف بشكل دائم"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "اسم"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "تم الحذف"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] "مجلدات %n"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] " ملفات %n"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -79,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "لا يوجد شيء هنا. سلة المهملات خاليه."
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "اسم"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "استعيد"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "تم الحذف"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "إلغاء"
 
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index 7044e6440151fc5ea55e79fdc4bf4b2864a2947f..3f48a29c48d59b056db8d985d00a206cb5a2bd52 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "المساعدة"
diff --git a/l10n/be/core.po b/l10n/be/core.po
index 6f43f16cfa1a594bf5c49b832dd2eb16a23c12dd..1e8e9ca8b428b96481a16c8835fd9a0858378ca3 100644
--- a/l10n/be/core.po
+++ b/l10n/be/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -321,27 +282,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -350,7 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr ""
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -382,7 +327,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr ""
 
@@ -454,30 +399,58 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -514,7 +487,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr ""
 
@@ -558,7 +531,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr ""
 
@@ -570,6 +543,34 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -599,14 +600,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr ""
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -696,12 +689,12 @@ msgstr "Завяршыць ўстаноўку."
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr ""
 
@@ -719,19 +712,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/be/files_encryption.po b/l10n/be/files_encryption.po
index ea3a5a18133717fd1f963f11449d64c7db7ff927..d52e46a2b6648a1c3ce65a53b23471b17628c8e3 100644
--- a/l10n/be/files_encryption.po
+++ b/l10n/be/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/be/files_sharing.po b/l10n/be/files_sharing.po
index d8ea6184ffa147773b2410eaddcd022e5078bbdf..0a51f46b089be85504fb0e7b47b51f805099df46 100644
--- a/l10n/be/files_sharing.po
+++ b/l10n/be/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-07-31 01:55-0400\n"
-"PO-Revision-Date: 2013-07-31 05:56+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
-msgid "Password"
+msgid "The password is wrong. Try again."
 msgstr ""
 
-#: templates/authenticate.php:9
-msgid "Submit"
+#: templates/authenticate.php:10
+msgid "Password"
 msgstr ""
 
 #: templates/part.404.php:3
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:85
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/be/files_trashbin.po b/l10n/be/files_trashbin.po
index 770cceb542cbcc8659f7a27e06814e48c5561ec8..d784d5ddc54e8d27780fc5f5d3df377c2b6adc58 100644
--- a/l10n/be/files_trashbin.po
+++ b/l10n/be/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-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -27,59 +27,31 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:100
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:36
-msgid "delete file permanently"
+#: lib/trashbin.php:814 lib/trashbin.php:816
+msgid "restored"
 msgstr ""
 
-#: js/trash.js:127
-msgid "Delete permanently"
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: js/trash.js:182 templates/index.php:17
+#: templates/index.php:23
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:183 templates/index.php:27
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:191
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: js/trash.js:197
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: lib/trash.php:819 lib/trash.php:821
-msgid "restored"
-msgstr ""
-
-#: templates/index.php:9
-msgid "Nothing in here. Your trash bin is empty!"
+#: templates/index.php:26 templates/index.php:28
+msgid "Restore"
 msgstr ""
 
-#: templates/index.php:20 templates/index.php:22
-msgid "Restore"
+#: templates/index.php:34
+msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:30 templates/index.php:31
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr ""
 
diff --git a/l10n/be/user_ldap.po b/l10n/be/user_ldap.po
index f2cad633ff3644125d81308bf4bbf4305a521e19..5f5d2303a821f91bdc0920a06cb8d4f3439329ba 100644
--- a/l10n/be/user_ldap.po
+++ b/l10n/be/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:36
+#: ajax/testConfiguration.php:37
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:39
+#: ajax/testConfiguration.php:40
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:43
+#: ajax/testConfiguration.php:44
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 81c772ffb69713a87bf2b644f04c0ff03703e757..f5ad0a1ac5a34b97f0a08fb85280516639401c21 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -311,27 +272,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -340,7 +280,12 @@ msgstr ""
 msgid "Share"
 msgstr "Споделяне"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Грешка"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -372,7 +317,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Парола"
 
@@ -444,30 +389,58 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Внимание"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Изтриване"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Добавяне"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -504,7 +477,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Ще получите връзка за нулиране на паролата Ви."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Потребител"
 
@@ -548,7 +521,7 @@ msgstr "Лични"
 msgid "Users"
 msgstr "Потребители"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Приложения"
 
@@ -560,6 +533,34 @@ msgstr "Админ"
 msgid "Help"
 msgstr "Помощ"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Достъпът е забранен"
@@ -589,14 +590,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Редактиране на категориите"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Добавяне"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -686,12 +679,12 @@ msgstr "Завършване на настройките"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Изход"
 
@@ -709,19 +702,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Забравена парола?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "запомни"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Вход"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index cafce814652f5fd667d7b978f886567a26d8cca9..8b1fa9adbdee726aaa8009a53b63c04c7f5144d3 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -74,15 +74,15 @@ msgstr "Възникна проблем при запис в диска"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Невалидна директория."
 
@@ -90,36 +90,36 @@ msgstr "Невалидна директория."
 msgid "Files"
 msgstr "Файлове"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr ""
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Качването е спряно."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Грешка"
 
@@ -131,7 +131,7 @@ msgstr "Споделяне"
 msgid "Delete permanently"
 msgstr "Изтриване завинаги"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Преименуване"
 
@@ -163,13 +163,13 @@ msgstr ""
 msgid "undo"
 msgstr "възтановяване"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -226,25 +226,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Променено"
 
@@ -253,7 +253,7 @@ msgstr "Променено"
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Качване"
 
@@ -289,65 +289,65 @@ msgstr ""
 msgid "Save"
 msgstr "Запис"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Ново"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Текстов файл"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Папка"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Спри качването"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Няма нищо тук. Качете нещо."
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Изтегляне"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Изтриване"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Файлът който сте избрали за качване е прекалено голям"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файловете които се опитвате да качите са по-големи от позволеното за сървъра."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Файловете се претърсват, изчакайте."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/bg_BG/files_encryption.po b/l10n/bg_BG/files_encryption.po
index 8d27a845f129b668f5bed85fbc96df5a0fff8bd9..68702844a5d749de1da40ceeca0ac3f4eeb651f3 100644
--- a/l10n/bg_BG/files_encryption.po
+++ b/l10n/bg_BG/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Криптиране"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index 20f297f9cdcd1c3defeca0fa9d59b83b995202c4..a412adb58fd2ba55c7411b0f197e8bb003560495 100644
--- a/l10n/bg_BG/files_sharing.po
+++ b/l10n/bg_BG/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Парола"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Потвърждение"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s сподели папката %s с Вас"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s сподели файла %s с Вас"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Изтегляне"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Качване"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Спри качването"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Няма наличен преглед за"
diff --git a/l10n/bg_BG/files_trashbin.po b/l10n/bg_BG/files_trashbin.po
index 4808f7ca7577588d224e50b806607c456722eee7..3dad233d5a966c55986c828f4e38951b76c60090 100644
--- a/l10n/bg_BG/files_trashbin.po
+++ b/l10n/bg_BG/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -28,42 +28,10 @@ msgstr "Невъзможно перманентното изтриване на
 msgid "Couldn't restore %s"
 msgstr "Невъзможно възтановяване на %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "извършване на действие по възстановяване"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Грешка"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "изтриване на файла завинаги"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Изтриване завинаги"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Име"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Изтрито"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -72,11 +40,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Няма нищо. Кофата е празна!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Име"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Възтановяване"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Изтрито"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Изтриване"
 
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index af4a44396fff26ce216d0d159df8e93c7dddfb00..d013104d5de29938210f59b394093f1e83392aa9 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Помощ"
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 8ebf3b7cda2d34f9511a6bee569167fea82f6501..27a0eee4fd89c90306b96412ef4f7ca5f78c2013 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 "%s ID প্রদান করা হয় নি।"
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "প্রিয়তে %s যোগ করতে সমস্যা দেখা দিয়েছে।"
-
-#: 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 "প্রিয় থেকে %s সরিয়ে ফেলতে সমস্যা দেখা দিয়েছে।"
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -311,27 +272,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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 "আবশ্যিক {file} টি সংস্থাপিত নেই !"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "ভাগাভাগিকৃত"
@@ -340,7 +280,12 @@ msgstr "ভাগাভাগিকৃত"
 msgid "Share"
 msgstr "ভাগাভাগি কর"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "সমস্যা"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "ভাগাভাগি করতে সমস্যা দেখা দিয়েছে  "
 
@@ -372,7 +317,7 @@ msgstr "লিংকের সাথে ভাগাভাগি কর"
 msgid "Password protect"
 msgstr "কূটশব্দ সুরক্ষিত"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "কূটশব্দ"
 
@@ -444,30 +389,58 @@ msgstr "মুছে ফেল"
 msgid "share"
 msgstr "ভাগাভাগি কর"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "কূটশব্দদ্বারা সুরক্ষিত"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা দেখা দিয়েছে"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "পাঠানো হচ্ছে......"
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "ই-মেইল পাঠানো হয়েছে"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "সতর্কবাণী"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "অবজেক্টের ধরণটি সুনির্দিষ্ট নয়।"
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "মুছে"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "যোগ কর"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -504,7 +477,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।"
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "ব্যবহারকারী"
 
@@ -548,7 +521,7 @@ msgstr "ব্যক্তিগত"
 msgid "Users"
 msgstr "ব্যবহারকারী"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "অ্যাপ"
 
@@ -560,6 +533,34 @@ msgstr "প্রশাসন"
 msgid "Help"
 msgstr "সহায়িকা"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "অধিগমনের অনুমতি নেই"
@@ -589,14 +590,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "ক্যাটেগরি সম্পাদনা"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "যোগ কর"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -686,12 +679,12 @@ msgstr "সেটআপ সুসম্পন্ন কর"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "প্রস্থান"
 
@@ -709,19 +702,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "কূটশব্দ হারিয়েছেন?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "মনে রাখ"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "প্রবেশ"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index 180a499d4ba2e01e89f64af3e38f38d9cd05f9e3..326272753af90aae6013cc1de58c8111b8912863 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -74,15 +74,15 @@ msgstr "ডিস্কে লিখতে ব্যর্থ"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "ভুল ডিরেক্টরি"
 
@@ -90,36 +90,36 @@ msgstr "ভুল ডিরেক্টরি"
 msgid "Files"
 msgstr "ফাইল"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "যথেষ্ঠ পরিমাণ স্থান নেই"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "আপলোড বাতিল করা হয়েছে।"
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।"
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL ফাঁকা রাখা যাবে না।"
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "সমস্যা"
 
@@ -131,7 +131,7 @@ msgstr "ভাগাভাগি কর"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "পূনঃনামকরণ"
 
@@ -163,13 +163,13 @@ msgstr "{new_name} কে {old_name} নামে প্রতিস্থাপ
 msgid "undo"
 msgstr "ক্রিয়া প্রত্যাহার"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -226,25 +226,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "রাম"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "আকার"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "পরিবর্তিত"
 
@@ -253,7 +253,7 @@ msgstr "পরিবর্তিত"
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "আপলোড"
 
@@ -289,65 +289,65 @@ msgstr "ZIP ফাইলের ইনপুটের সর্বোচ্চ 
 msgid "Save"
 msgstr "সংরক্ষণ"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "নতুন"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "টেক্সট ফাইল"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "ফোল্ডার"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr " লিংক থেকে"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "আপলোড বাতিল কর"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "এখানে কিছুই নেই। কিছু আপলোড করুন !"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "ডাউনলোড"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "ভাগাভাগি বাতিল "
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "মুছে"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "আপলোডের আকারটি অনেক বড়"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "আপনি এই সার্ভারে আপলোড করার জন্য অনুমোদিত ফাইলের সর্বোচ্চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ্টা করছেন "
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।"
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "বর্তমান স্ক্যানিং"
 
diff --git a/l10n/bn_BD/files_encryption.po b/l10n/bn_BD/files_encryption.po
index e29f584dbb4f7ba110fd4541cf101226091c4d3b..db4cdedcafa80e5de4e68a490d115c5ad9baa129 100644
--- a/l10n/bn_BD/files_encryption.po
+++ b/l10n/bn_BD/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "সংকেতায়ন"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po
index f44908ae2c1f765b567f245e736ef1e7e6d7bf65..27111cae91c4306bd253b52b8d01190add5edd74 100644
--- a/l10n/bn_BD/files_sharing.po
+++ b/l10n/bn_BD/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "কূটশব্দ"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "জমা দিন"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s আপনার সাথে %s ফোল্ডারটি ভাগাভাগি করেছেন"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s আপনার সাথে %s ফাইলটি ভাগাভাগি করেছেন"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "ডাউনলোড"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "আপলোড"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "আপলোড বাতিল কর"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "এর জন্য কোন প্রাকবীক্ষণ সুলভ নয়"
diff --git a/l10n/bn_BD/files_trashbin.po b/l10n/bn_BD/files_trashbin.po
index 380a02ad7c0b9b4deb418e36ce292de15ab4cd2e..4161e8bfbd2e19df0aafe2cfa07793ee26c55dfe 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -27,42 +27,10 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "সমস্যা"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr ""
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "রাম"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -71,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "রাম"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "মুছে"
 
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index da700cd7af9247fcd4910e9aad8b0e2ef4812ae6..c2b70b81a0793b55a4a44ec49db36612178cac6c 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "সহায়িকা"
diff --git a/l10n/bs/core.po b/l10n/bs/core.po
index 033779725537fb2030c4e7a418176ecc5b4c8016..6f8c64d63a28daf83807d3f3292bbaf16da40286 100644
--- a/l10n/bs/core.po
+++ b/l10n/bs/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -316,27 +277,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -345,7 +285,12 @@ msgstr ""
 msgid "Share"
 msgstr "Podijeli"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr ""
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -377,7 +322,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr ""
 
@@ -449,30 +394,58 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Dodaj"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -509,7 +482,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr ""
 
@@ -553,7 +526,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr ""
 
@@ -565,6 +538,34 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -594,14 +595,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Dodaj"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -691,12 +684,12 @@ msgstr ""
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr ""
 
@@ -714,19 +707,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/bs/files.po b/l10n/bs/files.po
index 09d48d49e33aa3e4231b210d411f7682b78383c5..d3d6e83d286a4daaf6f861ee7340ad3f99cfba62 100644
--- a/l10n/bs/files.po
+++ b/l10n/bs/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -74,15 +74,15 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr ""
 
@@ -90,36 +90,36 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr ""
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr ""
 
@@ -131,7 +131,7 @@ msgstr "Podijeli"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr ""
 
@@ -163,14 +163,14 @@ msgstr ""
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -229,25 +229,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr ""
 
@@ -256,7 +256,7 @@ msgstr ""
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr ""
 
@@ -292,65 +292,65 @@ msgstr ""
 msgid "Save"
 msgstr "Spasi"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Fasikla"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/bs/files_encryption.po b/l10n/bs/files_encryption.po
index e7930cc014a1b01688248a6f862da488cce10adb..4a48ee2fe97f58c0d2ac160cf6069845f2587000 100644
--- a/l10n/bs/files_encryption.po
+++ b/l10n/bs/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/bs/files_sharing.po b/l10n/bs/files_sharing.po
index 47ff900767acf32658bf32295d9e042b91307bfe..79f667fc339481c17beb6e12bb6d827e7daa4cd1 100644
--- a/l10n/bs/files_sharing.po
+++ b/l10n/bs/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-07-31 01:55-0400\n"
-"PO-Revision-Date: 2013-07-31 05:56+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,15 @@ msgstr ""
 "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"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
-msgid "Password"
+msgid "The password is wrong. Try again."
 msgstr ""
 
-#: templates/authenticate.php:9
-msgid "Submit"
+#: templates/authenticate.php:10
+msgid "Password"
 msgstr ""
 
 #: templates/part.404.php:3
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:85
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/bs/files_trashbin.po b/l10n/bs/files_trashbin.po
index 319adc5d239e28576fa5b9fc505e3efd5be81b7f..e2a429d7101f91b87285f11c1c0b98dfa5b63b84 100644
--- a/l10n/bs/files_trashbin.po
+++ b/l10n/bs/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-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -27,57 +27,31 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:100
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:36
-msgid "delete file permanently"
+#: lib/trashbin.php:814 lib/trashbin.php:816
+msgid "restored"
 msgstr ""
 
-#: js/trash.js:127
-msgid "Delete permanently"
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: js/trash.js:182 templates/index.php:17
+#: templates/index.php:23
 msgid "Name"
 msgstr "Ime"
 
-#: js/trash.js:183 templates/index.php:27
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:191
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/trash.js:197
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: lib/trash.php:819 lib/trash.php:821
-msgid "restored"
-msgstr ""
-
-#: templates/index.php:9
-msgid "Nothing in here. Your trash bin is empty!"
+#: templates/index.php:26 templates/index.php:28
+msgid "Restore"
 msgstr ""
 
-#: templates/index.php:20 templates/index.php:22
-msgid "Restore"
+#: templates/index.php:34
+msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:30 templates/index.php:31
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr ""
 
diff --git a/l10n/bs/user_ldap.po b/l10n/bs/user_ldap.po
index 6e276fcf031ed47ca4e45a06b2343a0a74620cd2..45a07276bcf151a5ef07e7bf99bcf6d1d1fad5d7 100644
--- a/l10n/bs/user_ldap.po
+++ b/l10n/bs/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:36
+#: ajax/testConfiguration.php:37
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:39
+#: ajax/testConfiguration.php:40
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:43
+#: ajax/testConfiguration.php:44
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index dd2de8f06c7843ff2ea91bcc681d48b3a82b7254..3cd33c5a98d9e28960e115adaeea437ac0de1cf1 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -58,45 +58,6 @@ msgstr "Actualitzada la memòria de cau dels fitxers"
 msgid "... %d%% done ..."
 msgstr "... %d%% fet ..."
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "No s'ha especificat el tipus de categoria."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "No voleu afegir cap categoria?"
-
-#: ajax/vcategories/add.php:37
-#, 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
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "No s'ha proporcionat el tipus d'objecte."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "No s'ha proporcionat la ID %s."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Error en afegir %s als preferits."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "No hi ha categories per eliminar."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Error en eliminar %s dels preferits."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "No s'han proporcionat imatges o fitxers"
@@ -313,27 +274,6 @@ msgstr "({count} seleccionats)"
 msgid "Error loading file exists template"
 msgstr "Error en carregar la plantilla de fitxer existent"
 
-#: 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 "No s'ha especificat el tipus d'objecte."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Error"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "No s'ha especificat el nom de l'aplicació."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "El fitxer requerit {file} no està instal·lat!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Compartit"
@@ -342,7 +282,12 @@ msgstr "Compartit"
 msgid "Share"
 msgstr "Comparteix"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Error"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Error en compartir"
 
@@ -374,7 +319,7 @@ msgstr "Comparteix amb enllaç"
 msgid "Password protect"
 msgstr "Protegir amb contrasenya"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -446,30 +391,58 @@ msgstr "elimina"
 msgid "share"
 msgstr "comparteix"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Protegeix amb contrasenya"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Error en eliminar la data de venciment"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Error en establir la data de venciment"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Enviant..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "El correu electrónic s'ha enviat"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Avís"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "No s'ha especificat el tipus d'objecte."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Esborra"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Afegeix"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -506,7 +479,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Nom d'usuari"
 
@@ -550,7 +523,7 @@ msgstr "Personal"
 msgid "Users"
 msgstr "Usuaris"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Aplicacions"
 
@@ -562,6 +535,34 @@ msgstr "Administració"
 msgid "Help"
 msgstr "Ajuda"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Accés prohibit"
@@ -591,14 +592,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Edita les categories"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Afegeix"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -688,12 +681,12 @@ msgstr "Acaba la configuració"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s està disponible. Obtingueu més informació de com actualitzar."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Surt"
 
@@ -711,19 +704,27 @@ msgstr "Se no heu canviat la contrasenya recentment el vostre compte pot estar c
 msgid "Please change your password to secure your account again."
 msgstr "Canvieu la contrasenya de nou per assegurar el vostre compte."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Heu perdut la contrasenya?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "recorda'm"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Inici de sessió"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Acreditacions alternatives"
 
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index bfbedf31ec5eb3cd622fbf4ed81a30c2239d4e4d..1e1773a997642ab24acb97ef99a9a1fe7f0e78d8 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -76,15 +76,15 @@ msgstr "Ha fallat en escriure al disc"
 msgid "Not enough storage available"
 msgstr "No hi ha prou espai disponible"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr "La pujada ha fallat. No s'ha pogut obtenir informació del fitxer."
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr "La pujada ha fallat. El fitxer pujat no s'ha trobat."
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Directori no vàlid."
 
@@ -92,36 +92,36 @@ msgstr "Directori no vàlid."
 msgid "Files"
 msgstr "Fitxers"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "No es pot pujar {filename} perquè és una carpeta o té 0 bytes"
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "No hi ha prou espai disponible"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "La pujada s'ha cancel·lat."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr "No hi ha resposta del servidor."
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "La URL no pot ser buida"
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Error"
 
@@ -133,7 +133,7 @@ msgstr "Comparteix"
 msgid "Delete permanently"
 msgstr "Esborra permanentment"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Reanomena"
 
@@ -165,13 +165,13 @@ msgstr "s'ha substituït {old_name} per {new_name}"
 msgid "undo"
 msgstr "desfés"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n carpeta"
 msgstr[1] "%n carpetes"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fitxer"
@@ -228,25 +228,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "L'encriptació s'ha desactivat però els vostres fitxers segueixen encriptats. Aneu a la vostra configuració personal per desencriptar els vostres fitxers."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "S'està preparant la baixada. Pot trigar una estona si els fitxers són grans."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "Error en moure el fitxer"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Mida"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Modificat"
 
@@ -255,7 +255,7 @@ msgstr "Modificat"
 msgid "%s could not be renamed"
 msgstr "%s no es pot canviar el nom"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Puja"
 
@@ -291,65 +291,65 @@ msgstr "Mida màxima d'entrada per fitxers ZIP"
 msgid "Save"
 msgstr "Desa"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nou"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Fitxer de text"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Carpeta"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Des d'enllaç"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Fitxers esborrats"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Cancel·la la pujada"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "No teniu permisos d'escriptura aquí."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Res per aquí. Pugeu alguna cosa!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Deixa de compartir"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Esborra"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "La pujada és massa gran"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor"
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "S'estan escanejant els fitxers, espereu"
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Actualment escanejant"
 
diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po
index e03c0ada38ab5dc9afc454c9c79fda3ec1d7e9b7..187c2c25278c97d41a3537f830bec0e541375cac 100644
--- a/l10n/ca/files_encryption.po
+++ b/l10n/ca/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -56,14 +56,14 @@ msgid ""
 "correct."
 msgstr "No s'ha pogut actualitzar la contrasenya de la clau privada. Potser la contrasenya anterior no era correcta."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -71,6 +71,18 @@ msgid ""
 "files."
 msgstr "La clau privada no és vàlida! Probablement la contrasenya va ser canviada des de fora del sistema ownCloud (per exemple, en el directori de l'empresa). Vostè pot actualitzar la contrasenya de clau privada en la seva configuració personal per poder recuperar l'accés en els arxius xifrats."
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "Manca de requisits."
@@ -82,7 +94,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Assegureu-vos que teniu instal·lat PHP 5.3.3 o una versió superior i que està activat Open SSL i habilitada i configurada correctament l'extensió de PHP. De moment, l'aplicació d'encriptació s'ha desactivat."
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "Els usuaris següents no estan configurats per a l'encriptació:"
 
@@ -98,91 +110,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "arranjament personal"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Xifrat"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Activa la clau de recuperació (permet recuperar fitxers d'usuaris en cas de pèrdua de contrasenya):"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "Clau de recuperació de la contrasenya"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Activat"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Desactivat"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "Canvia la clau de recuperació de contrasenya:"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "Antiga clau de recuperació de contrasenya"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "Nova clau de recuperació de contrasenya"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Canvia la contrasenya"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "La clau privada ja no es correspon amb la contrasenya d'accés:"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "Establiu la vostra contrasenya clau en funció de la contrasenya actual d'accés."
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Si no recordeu la contrasenya anterior podeu demanar a l'administrador que recuperi els vostres fitxers."
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Contrasenya anterior d'accés"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Contrasenya d'accés actual"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "Actualitza la contrasenya de clau privada"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Habilita la recuperació de contrasenya:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Activar aquesta opció us permetrà obtenir de nou accés als vostres fitxers encriptats en cas de perdre la contrasenya"
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "S'han  actualitzat els arranjaments de recuperació de fitxers"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "No s'ha pogut actualitzar la recuperació de fitxers"
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index 4e4d3419baef02bba17aa3748733380cb162667b..7cd1179aa362e0a402af9a0d8073201d5e13970d 100644
--- a/l10n/ca/files_sharing.po
+++ b/l10n/ca/files_sharing.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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "la contrasenya és incorrecta. Intenteu-ho de nou."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Contrasenya"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Envia"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Aquest enllaç sembla que no funciona."
@@ -54,28 +54,28 @@ msgstr "s'ha desactivat la compartició"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Per més informació contacteu amb qui us ha enviat l'enllaç."
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ha compartit la carpeta %s amb vós"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ha compartit el fitxer %s amb vós"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Puja"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Cancel·la la pujada"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "No hi ha vista prèvia disponible per a"
diff --git a/l10n/ca/files_trashbin.po b/l10n/ca/files_trashbin.po
index 3f33f7d6493833fc4c07924dfd8fbd10afc9864e..38bb538e5612354f4d1757154c2cb297dc612863 100644
--- a/l10n/ca/files_trashbin.po
+++ b/l10n/ca/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -28,42 +28,10 @@ msgstr "No s'ha pogut esborrar permanentment %s"
 msgid "Couldn't restore %s"
 msgstr "No s'ha pogut restaurar %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "executa l'operació de restauració"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Error"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "esborra el fitxer permanentment"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Esborra permanentment"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Nom"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Eliminat"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] "%n carpetes"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] "%n fitxers"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "restaurat"
@@ -72,11 +40,19 @@ msgstr "restaurat"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "La paperera està buida!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Nom"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Recupera"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Eliminat"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Esborra"
 
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 2d7c4b3b606ef1c195586c627f68b7f35859ffa6..738583e7b61cccdde51bb86cb998e72b65ab2a88 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-07 12:17-0400\n"
+"PO-Revision-Date: 2013-10-07 10:50+0000\n"
+"Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -183,32 +183,32 @@ msgstr "desfés"
 msgid "Unable to remove user"
 msgstr "No s'ha pogut eliminar l'usuari"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: js/users.js:95 templates/users.php:26 templates/users.php:90
 #: templates/users.php:118
 msgid "Groups"
 msgstr "Grups"
 
-#: js/users.js:97 templates/users.php:92 templates/users.php:130
+#: js/users.js:100 templates/users.php:92 templates/users.php:130
 msgid "Group Admin"
 msgstr "Grup Admin"
 
-#: js/users.js:120 templates/users.php:170
+#: js/users.js:123 templates/users.php:170
 msgid "Delete"
 msgstr "Esborra"
 
-#: js/users.js:277
+#: js/users.js:280
 msgid "add group"
 msgstr "afegeix grup"
 
-#: js/users.js:436
+#: js/users.js:442
 msgid "A valid username must be provided"
 msgstr "Heu de facilitar un nom d'usuari vàlid"
 
-#: js/users.js:437 js/users.js:443 js/users.js:458
+#: js/users.js:443 js/users.js:449 js/users.js:464
 msgid "Error creating user"
 msgstr "Error en crear l'usuari"
 
-#: js/users.js:442
+#: js/users.js:448
 msgid "A valid password must be provided"
 msgstr "Heu de facilitar una contrasenya vàlida"
 
@@ -344,11 +344,11 @@ msgstr "Permet als usuaris compartir només amb els usuaris del seu grup"
 
 #: templates/admin.php:170
 msgid "Allow mail notification"
-msgstr ""
+msgstr "Permet notificacions per correu electrónic"
 
 #: templates/admin.php:171
 msgid "Allow user to send mail notification for shared files"
-msgstr ""
+msgstr "Permet a l'usuari enviar notificacions de fitxers compartits per correu "
 
 #: templates/admin.php:178
 msgid "Security"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 79d3480d9a49e0b1a8db70e964065d7fc4abb328..45266ce5e41289ffd52125ec446c9c3c426ea8d7 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -369,14 +369,18 @@ msgid ""
 msgstr "Per defecte, owncloud autodetecta l'atribut UUID. L'atribut UUID s'utilitza per identificar usuaris i grups de forma indubtable. També el nom d'usuari intern es crearà en base a la UUIS, si no heu especificat res diferent a dalt. Podeu sobreescriure l'arranjament i passar l'atribut que desitgeu. Heu d'assegurar-vos que l'atribut que escolliu pot ser recollit tant pels usuaris com pels grups i que és únic. Deixeu-ho en blanc si preferiu el comportament per defecte. els canvis s'aplicaran als usuaris i grups LDAP mapats de nou (afegits)."
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "Atribut UUID:"
+msgid "UUID Attribute for Users:"
+msgstr ""
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "Mapatge d'usuari Nom d'usuari-LDAP"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -390,18 +394,18 @@ msgid ""
 "experimental stage."
 msgstr "Els noms d'usuari s'usen per desar i assignar (meta)dades. Per tal d'identificar amb precisió i reconèixer els usuaris, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix mapatge del nom d'usuari a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. A més, la DN es posa a la memòria de cau per reduir la interacció LDAP, però no s'usa per identificació. En cas que la DN canvïi, els canvis es trobaran. El nom d'usuari intern s'usa a tot arreu. Si esborreu els mapatges quedaran sobrants a tot arreu. Esborrar els mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No esborreu mai els mapatges en un entorn de producció, només en un estadi de prova o experimental."
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Elimina el mapatge d'usuari Nom d'usuari-LDAP"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Elimina el mapatge de grup Nom de grup-LDAP"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Comprovació de la configuració"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 8fe87fba02ecb47024da711a4ba9ba9909213cf1..d0e9f4d7ffd1298999cb4e710555dba0bc1e0cbd 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -62,45 +62,6 @@ msgstr "Aktualizována souborová mezipaměť"
 msgid "... %d%% done ..."
 msgstr "... %d%% dokončeno ..."
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Nezadán typ kategorie."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Žádná kategorie k přidání?"
-
-#: ajax/vcategories/add.php:37
-#, 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
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Nezadán typ objektu."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "Nezadáno ID %s."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Chyba při přidávání %s k oblíbeným."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Žádné kategorie nebyly vybrány ke smazání."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Chyba při odebírání %s z oblíbených."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Soubor nebo obrázek nebyl zadán"
@@ -322,27 +283,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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 "Není určen typ objektu."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Chyba"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Není určen název aplikace."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Požadovaný soubor {file} není nainstalován!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Sdílené"
@@ -351,7 +291,12 @@ msgstr "Sdílené"
 msgid "Share"
 msgstr "Sdílet"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Chyba"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Chyba při sdílení"
 
@@ -383,7 +328,7 @@ msgstr "Sdílet s odkazem"
 msgid "Password protect"
 msgstr "Chránit heslem"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Heslo"
 
@@ -455,30 +400,58 @@ msgstr "smazat"
 msgid "share"
 msgstr "sdílet"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Chráněno heslem"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Chyba při odstraňování data vypršení platnosti"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Chyba při nastavení data vypršení platnosti"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Odesílám ..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "E-mail odeslán"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Varování"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Není určen typ objektu."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Smazat"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Přidat"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -515,7 +488,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "E-mailem Vám bude zaslán odkaz pro obnovu hesla."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Uživatelské jméno"
 
@@ -559,7 +532,7 @@ msgstr "Osobní"
 msgid "Users"
 msgstr "Uživatelé"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Aplikace"
 
@@ -571,6 +544,34 @@ msgstr "Administrace"
 msgid "Help"
 msgstr "Nápověda"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Přístup zakázán"
@@ -600,14 +601,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Upravit kategorie"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Přidat"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -697,12 +690,12 @@ msgstr "Dokončit nastavení"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s je dostupná. Získejte více informací k postupu aktualizace."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Odhlásit se"
 
@@ -720,19 +713,27 @@ msgstr "Pokud jste v nedávné době neměnili své heslo, Váš účet může b
 msgid "Please change your password to secure your account again."
 msgstr "Změňte, prosím, své heslo pro opětovné zabezpečení Vašeho účtu."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Ztratili jste své heslo?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "zapamatovat"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Přihlásit"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Alternativní přihlášení"
 
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 631ace328f692de359d7cfed4decf3c489822cb4..a9b67e88c48ff8a559f17aa8c204f8e6fe331765 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -79,15 +79,15 @@ msgstr "Zápis na disk selhal"
 msgid "Not enough storage available"
 msgstr "Nedostatek dostupného úložného prostoru"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Neplatný adresář"
 
@@ -95,36 +95,36 @@ msgstr "Neplatný adresář"
 msgid "Files"
 msgstr "Soubory"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Nedostatek volného místa"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Odesílání zrušeno."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL nemůže být prázdná."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Název složky nelze použít. Použití názvu 'Shared' je ownCloudem rezervováno"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Chyba"
 
@@ -136,7 +136,7 @@ msgstr "Sdílet"
 msgid "Delete permanently"
 msgstr "Trvale odstranit"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Přejmenovat"
 
@@ -168,14 +168,14 @@ msgstr "nahrazeno {new_name} s {old_name}"
 msgid "undo"
 msgstr "vrátit zpět"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n složka"
 msgstr[1] "%n složky"
 msgstr[2] "%n složek"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n soubor"
@@ -234,25 +234,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Šifrování bylo vypnuto, vaše soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde soubory odšifrujete."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "Chyba při přesunu souboru"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Název"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Upraveno"
 
@@ -261,7 +261,7 @@ msgstr "Upraveno"
 msgid "%s could not be renamed"
 msgstr "%s nemůže být přejmenován"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Odeslat"
 
@@ -297,65 +297,65 @@ msgstr "Maximální velikost vstupu pro ZIP soubory"
 msgid "Save"
 msgstr "Uložit"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nový"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Textový soubor"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Složka"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Z odkazu"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Odstraněné soubory"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Zrušit odesílání"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Nemáte zde práva zápisu."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Žádný obsah. Nahrajte něco."
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Stáhnout"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Zrušit sdílení"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Smazat"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Odesílaný soubor je příliš velký"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Soubory se prohledávají, prosím čekejte."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Aktuální prohledávání"
 
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
index 7f6ac78f5a8a9704b34cb0d5c25e05093f82c493..7b8d95e74f4029317519e957794500b22ac6f762 100644
--- a/l10n/cs_CZ/files_encryption.po
+++ b/l10n/cs_CZ/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -58,14 +58,14 @@ msgid ""
 "correct."
 msgstr "Nelze aktualizovat heslo soukromého klíče. Možná nebylo staré heslo správně."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -73,6 +73,18 @@ msgid ""
 "files."
 msgstr "Váš soukromý klíč není platný! Pravděpodobně bylo heslo změněno vně systému ownCloud (např. ve vašem firemním adresáři). Heslo vašeho soukromého klíče můžete změnit ve svém osobním nastavení pro obnovení přístupu k vašim zašifrovaným souborům."
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "Nesplněné závislosti."
@@ -84,7 +96,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Ujistěte se prosím, že máte nainstalované PHP 5.3.3 nebo novější a že máte povolené a správně nakonfigurované OpenSSL včetně jeho rozšíření pro PHP. Prozatím byla aplikace pro šifrování vypnuta."
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "Následující uživatelé nemají nastavené šifrování:"
 
@@ -100,91 +112,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "osobní nastavení"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Šifrování"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Povolit klíč pro obnovu (umožňuje obnovu uživatelských souborů v případě ztráty hesla)"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "Heslo klíče pro obnovu"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Povoleno"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Zakázáno"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "Změna hesla klíče pro obnovu:"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "Původní heslo klíče pro obnovu"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "Nové heslo klíče pro obnovu"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Změnit heslo"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Heslo vašeho soukromého klíče se již neshoduje s vaším přihlašovacím heslem:"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "Změňte heslo vaše soukromého klíče na stejné jako vaše přihlašovací heslo."
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Pokud si nepamatujete vaše původní heslo, můžete požádat správce o obnovu vašich souborů."
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Původní přihlašovací heslo"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Aktuální přihlašovací heslo"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "Změnit heslo soukromého klíče"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Povolit obnovu hesla:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Zapnutí této volby vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo"
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "Možnosti záchrany souborů aktualizovány"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "Nelze nastavit záchranu souborů"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index 5b180f5c5591a25230b085eb39fcfe33273c5209..2550750494a56351949ccebb86e015fa45bca8b5 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "Heslo není správné. Zkuste to znovu."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Odeslat"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Je nám líto, ale tento odkaz již není funkční."
@@ -54,28 +54,28 @@ msgstr "sdílení je zakázané"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Pro více informací kontaktujte osobu, která vám zaslala tento odkaz."
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s s Vámi sdílí složku %s"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s s Vámi sdílí soubor %s"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Stáhnout"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Odeslat"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Zrušit odesílání"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Náhled není dostupný pro"
diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po
index 3b54400bc0c735b4b42d2d6082c5af85c929ba2e..acce0366259bd3ec3f612894ce14caf373f5370b 100644
--- a/l10n/cs_CZ/files_trashbin.po
+++ b/l10n/cs_CZ/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -29,44 +29,10 @@ msgstr "Nelze trvale odstranit %s"
 msgid "Couldn't restore %s"
 msgstr "Nelze obnovit %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "provést obnovu"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Chyba"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "trvale odstranit soubor"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Trvale odstranit"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Název"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Smazáno"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n adresář"
-msgstr[1] "%n adresáře"
-msgstr[2] "%n adresářů"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n soubor"
-msgstr[1] "%n soubory"
-msgstr[2] "%n souborů"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "obnoveno"
@@ -75,11 +41,19 @@ msgstr "obnoveno"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Žádný obsah. Váš koš je prázdný."
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Název"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Obnovit"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Smazáno"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Smazat"
 
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 9d29eb9ed88fdec3b77d5fde9d465332e4f31da7..20c66f1e240e139e21b5b78f28cefc62cb1f9147 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -372,14 +372,18 @@ msgid ""
 msgstr "Ve výchozím nastavení je UUID atribut nalezen automaticky. UUID atribut je používán pro nezpochybnitelnou identifikaci uživatelů a skupin z LDAP. Navíc je na základě UUID tvořeno také interní uživatelské jméno, pokud není nastaveno jinak. Můžete výchozí nastavení přepsat a použít atribut, který sami zvolíte. Musíte se ale ujistit, že atribut, který vyberete, bude uveden jak u uživatelů, tak i u skupin a je unikátní. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele a skupiny z LDAP."
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "Atribut UUID:"
+msgid "UUID Attribute for Users:"
+msgstr ""
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "Mapování uživatelských jmen z LDAPu"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -393,18 +397,18 @@ msgid ""
 "experimental stage."
 msgstr "Uživatelská jména jsou používány pro uchovávání a přiřazování (meta)dat. Pro správnou identifikaci a rozpoznání uživatelů bude mít každý uživatel z LDAP interní uživatelské jméno. To vyžaduje mapování uživatelských jmen na uživatele LDAP. Vytvořené uživatelské jméno je mapováno na UUID uživatele v LDAP. Navíc je cachována DN pro zmenšení interakce s LDAP, ale není používána pro identifikaci. Pokud se DN změní, bude to správně rozpoznáno. Interní uživatelské jméno se používá celé. Vyčištění mapování zanechá zbytky všude. Vyčištění navíc není specifické konfiguraci, bude mít vliv na všechny LDAP konfigurace! Nikdy nečistěte mapování v produkčním prostředí, jen v testovací nebo experimentální fázi."
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Zrušit mapování uživatelských jmen LDAPu"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Zrušit mapování názvů skupin LDAPu"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Vyzkoušet nastavení"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Nápověda"
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index be33830457e3024cee891a6a7241500f2b1effc7..f04dfcb3d054c2b3ea73ac3681390008a73d5e07 100644
--- a/l10n/cy_GB/core.po
+++ b/l10n/cy_GB/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -57,45 +57,6 @@ msgstr ""
 msgid "... %d%% done ..."
 msgstr ""
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Math o gategori heb ei ddarparu."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Dim categori i'w ychwanegu?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Mae'r categori hwn eisoes yn bodoli: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Math o wrthrych heb ei ddarparu."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID heb ei ddarparu."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Gwall wrth ychwanegu %s at ffefrynnau."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Ni ddewiswyd categorïau i'w dileu."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Gwall wrth dynnu %s o ffefrynnau."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -322,27 +283,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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 "Nid yw'r math o wrthrych wedi cael ei nodi."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Gwall"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Nid yw enw'r pecyn wedi cael ei nodi."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Nid yw'r ffeil ofynnol {file} wedi ei gosod!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Rhannwyd"
@@ -351,7 +291,12 @@ msgstr "Rhannwyd"
 msgid "Share"
 msgstr "Rhannu"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Gwall"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Gwall wrth rannu"
 
@@ -383,7 +328,7 @@ msgstr "Dolen ar gyfer rhannu"
 msgid "Password protect"
 msgstr "Diogelu cyfrinair"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Cyfrinair"
 
@@ -455,30 +400,58 @@ msgstr "dileu"
 msgid "share"
 msgstr "rhannu"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Diogelwyd â chyfrinair"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Gwall wrth ddad-osod dyddiad dod i ben"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Gwall wrth osod dyddiad dod i ben"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Yn anfon ..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Anfonwyd yr e-bost"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Rhybudd"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Nid yw'r math o wrthrych wedi cael ei nodi."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Dileu"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Ychwanegu"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -515,7 +488,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Enw defnyddiwr"
 
@@ -559,7 +532,7 @@ msgstr "Personol"
 msgid "Users"
 msgstr "Defnyddwyr"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Pecynnau"
 
@@ -571,6 +544,34 @@ msgstr "Gweinyddu"
 msgid "Help"
 msgstr "Cymorth"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Mynediad wedi'i wahardd"
@@ -600,14 +601,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Golygu categorïau"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Ychwanegu"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -697,12 +690,12 @@ msgstr "Gorffen sefydlu"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ar gael. Mwy o wybodaeth am sut i ddiweddaru."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Allgofnodi"
 
@@ -720,19 +713,27 @@ msgstr "Os na wnaethoch chi newid eich cyfrinair yn ddiweddar, gall eich cyfrif
 msgid "Please change your password to secure your account again."
 msgstr "Newidiwch eich cyfrinair i ddiogleu eich cyfrif eto."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Wedi colli'ch cyfrinair?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "cofio"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Mewngofnodi"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Mewngofnodiadau Amgen"
 
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index c7432554834bc3c50b25b1e96327517ff01a4159..69921067566f3b3d6cf6a5cc781c7c381d7266ba 100644
--- a/l10n/cy_GB/files.po
+++ b/l10n/cy_GB/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -74,15 +74,15 @@ msgstr "Methwyd ysgrifennu i'r ddisg"
 msgid "Not enough storage available"
 msgstr "Dim digon o le storio ar gael"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Cyfeiriadur annilys."
 
@@ -90,36 +90,36 @@ msgstr "Cyfeiriadur annilys."
 msgid "Files"
 msgstr "Ffeiliau"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Dim digon o le ar gael"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Diddymwyd llwytho i fyny."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "Does dim hawl cael URL gwag."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Gwall"
 
@@ -131,7 +131,7 @@ msgstr "Rhannu"
 msgid "Delete permanently"
 msgstr "Dileu'n barhaol"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Ailenwi"
 
@@ -163,7 +163,7 @@ msgstr "newidiwyd {new_name} yn lle {old_name}"
 msgid "undo"
 msgstr "dadwneud"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
@@ -171,7 +171,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -232,25 +232,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Wrthi'n paratoi i lwytho i lawr. Gall gymryd peth amser os yw'r ffeiliau'n fawr."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Enw"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Maint"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Addaswyd"
 
@@ -259,7 +259,7 @@ msgstr "Addaswyd"
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Llwytho i fyny"
 
@@ -295,65 +295,65 @@ msgstr "Maint mewnbynnu mwyaf ffeiliau ZIP"
 msgid "Save"
 msgstr "Cadw"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Newydd"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Ffeil destun"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Plygell"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Dolen o"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Ffeiliau ddilewyd"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Diddymu llwytho i fyny"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Nid oes gennych hawliau ysgrifennu fan hyn."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Does dim byd fan hyn. Llwythwch rhywbeth i fyny!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Llwytho i lawr"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Dad-rannu"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Dileu"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Maint llwytho i fyny'n rhy fawr"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Arhoswch, mae ffeiliau'n cael eu sganio."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Sganio cyfredol"
 
diff --git a/l10n/cy_GB/files_encryption.po b/l10n/cy_GB/files_encryption.po
index 77fedfc65eaf7cddd92130b2b4c46fdc9b24c2e2..1b8cbfccfb71807de676768671b601ba19ef3f0a 100644
--- a/l10n/cy_GB/files_encryption.po
+++ b/l10n/cy_GB/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -54,14 +54,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -69,6 +69,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -80,7 +92,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -96,91 +108,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Amgryptiad"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po
index 11970a0b13941268f31f7e758376aed9b9fd6b5d..6cd3991b20afc3a4c2aa47e094f818fac7f9112b 100644
--- a/l10n/cy_GB/files_sharing.po
+++ b/l10n/cy_GB/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -18,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Cyfrinair"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Cyflwyno"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "Rhannodd %s blygell %s â chi"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "Rhannodd %s ffeil %s â chi"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Llwytho i lawr"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Llwytho i fyny"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Diddymu llwytho i fyny"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Does dim rhagolwg ar gael ar gyfer"
diff --git a/l10n/cy_GB/files_trashbin.po b/l10n/cy_GB/files_trashbin.po
index 69f8f97c375a39c14090dafb7e32d8e46efff48e..8013ebc0faf958b497deb90a809dce9103d808b8 100644
--- a/l10n/cy_GB/files_trashbin.po
+++ b/l10n/cy_GB/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,10 @@ msgstr "Methwyd dileu %s yn barhaol"
 msgid "Couldn't restore %s"
 msgstr "Methwyd adfer %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "gweithrediad adfer"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Gwall"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "dileu ffeil yn barhaol"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Dileu'n barhaol"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Enw"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Wedi dileu"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -75,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Does dim byd yma. Mae eich bin sbwriel yn wag!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Enw"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Adfer"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Wedi dileu"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Dileu"
 
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index 35fee083107f812fba0c2999ae57c13d6cc3a0c6..0cceee296368830636320073f56e0fa25f041b94 100644
--- a/l10n/cy_GB/user_ldap.po
+++ b/l10n/cy_GB/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Cymorth"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 45fa89e5c15472ccdd1ee81df58690aecee95204..99fcb6e695b40647057346b69810c1081eb42520 100644
--- a/l10n/da/core.po
+++ b/l10n/da/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:31+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -60,45 +60,6 @@ msgstr "Opdaterede filcache"
 msgid "... %d%% done ..."
 msgstr "... %d%% færdig ..."
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Kategori typen ikke er fastsat."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Ingen kategori at tilføje?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Kategorien eksisterer allerede: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Object type ikke er fastsat."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID ikke oplyst."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Fejl ved tilføjelse af %s til favoritter."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Ingen kategorier valgt"
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Fejl ved fjernelse af %s fra favoritter."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Ingen fil eller billede givet"
@@ -315,27 +276,6 @@ msgstr "({count} valgt)"
 msgid "Error loading file exists template"
 msgstr "Fejl ved inlæsning af; fil eksistere skabelon"
 
-#: 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 "Objekttypen er ikke angivet."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Fejl"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Den app navn er ikke angivet."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Den krævede fil {file} er ikke installeret!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Delt"
@@ -344,7 +284,12 @@ msgstr "Delt"
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Fejl"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Fejl under deling"
 
@@ -376,7 +321,7 @@ msgstr "Del med link"
 msgid "Password protect"
 msgstr "Beskyt med adgangskode"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Kodeord"
 
@@ -448,30 +393,58 @@ msgstr "slet"
 msgid "share"
 msgstr "del"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Beskyttet med adgangskode"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Fejl ved fjernelse af udløbsdato"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Fejl under sætning af udløbsdato"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Sender ..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "E-mail afsendt"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Advarsel"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Objekttypen er ikke angivet."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Slet"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Tilføj"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -508,7 +481,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Du vil modtage et link til at nulstille dit kodeord via email."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Brugernavn"
 
@@ -552,7 +525,7 @@ msgstr "Personligt"
 msgid "Users"
 msgstr "Brugere"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Apps"
 
@@ -564,6 +537,34 @@ msgstr "Admin"
 msgid "Help"
 msgstr "Hjælp"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Adgang forbudt"
@@ -593,14 +594,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Rediger kategorier"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Tilføj"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -690,12 +683,12 @@ msgstr "Afslut opsætning"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s er tilgængelig. Få mere information om, hvordan du opdaterer."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Log ud"
 
@@ -713,19 +706,27 @@ msgstr "Hvis du ikke har ændret din adgangskode for nylig, har nogen muligvis t
 msgid "Please change your password to secure your account again."
 msgstr "Skift adgangskode for at sikre din konto igen."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Mistet dit kodeord?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "husk"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Log ind"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Alternative logins"
 
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 1bb759e43d61d9cdd7b222a2a4e0b633e52e8943..730b04fdd89f2aa66788b76e520ffac0c39174ba 100644
--- a/l10n/da/files.po
+++ b/l10n/da/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -77,15 +77,15 @@ msgstr "Fejl ved skrivning til disk."
 msgid "Not enough storage available"
 msgstr "Der er ikke nok plads til rådlighed"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr "Upload fejlede. Kunne ikke hente filinformation."
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Upload fejlede. Kunne ikke finde den uploadede fil."
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Ugyldig mappe."
 
@@ -93,36 +93,36 @@ msgstr "Ugyldig mappe."
 msgid "Files"
 msgstr "Filer"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Kan ikke upload {filename} da det er enten en mappe eller indholder 0 bytes."
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "ikke nok tilgængelig ledig plads "
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Upload afbrudt."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr "Kunne ikke hente resultat fra server."
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URLen kan ikke være tom."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Ugyldigt mappenavn. Brug af 'Shared' er forbeholdt af ownCloud"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Fejl"
 
@@ -134,7 +134,7 @@ msgstr "Del"
 msgid "Delete permanently"
 msgstr "Slet permanent"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Omdøb"
 
@@ -166,13 +166,13 @@ msgstr "erstattede {new_name} med {old_name}"
 msgid "undo"
 msgstr "fortryd"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mappe"
 msgstr[1] "%n mapper"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fil"
@@ -229,25 +229,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. Gå venligst til dine personlige indstillinger for at dekryptere dine filer. "
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Dit download forberedes. Dette kan tage lidt tid ved større filer."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "Fejl ved flytning af fil"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Ændret"
 
@@ -256,7 +256,7 @@ msgstr "Ændret"
 msgid "%s could not be renamed"
 msgstr "%s kunne ikke omdøbes"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Upload"
 
@@ -292,65 +292,65 @@ msgstr "Maksimal størrelse på ZIP filer"
 msgid "Save"
 msgstr "Gem"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Ny"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Tekstfil"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Mappe"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Fra link"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Slettede filer"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Fortryd upload"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Du har ikke skriverettigheder her."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Her er tomt. Upload noget!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Fjern deling"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Slet"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Upload er for stor"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Filerne bliver indlæst, vent venligst."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Indlæser"
 
diff --git a/l10n/da/files_encryption.po b/l10n/da/files_encryption.po
index 403f3a3aa67df7d40665d43bf7656f158e5a9199..12e08c2a8f85792e5298d9134dcbc3184d4a5a63 100644
--- a/l10n/da/files_encryption.po
+++ b/l10n/da/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -55,14 +55,14 @@ msgid ""
 "correct."
 msgstr "Kunne ikke opdatere det private nøgle kodeord-. Måske var det gamle kodeord forkert."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -70,6 +70,18 @@ msgid ""
 "files."
 msgstr "Din private nøgle er gyldig! Sandsynligvis blev dit kodeord ændre uden for ownCloud systemet (f.eks. dit firmas register). Du kan opdatere dit private nøgle kodeord under personlige indstillinger, for at generhverve adgang til dine krypterede filer."
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "Manglende betingelser."
@@ -81,7 +93,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Sørg for at PHP 5.3.3 eller nyere er installeret og at OpenSSL sammen med PHP-udvidelsen er aktiveret og korrekt konfigureret. Indtil videre er krypteringsprogrammet deaktiveret."
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "Følgende brugere er ikke sat op til kryptering:"
 
@@ -97,91 +109,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "Personlige indstillinger"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Aktiver gendannelsesnøgle (Tillad gendannelse af brugerfiler i tilfælde af tab af kodeord):"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "Gendannelsesnøgle kodeord"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Aktiveret"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Deaktiveret"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "Skift gendannelsesnøgle kodeord:"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "Gammel Gendannelsesnøgle kodeord"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "Ny Gendannelsesnøgle kodeord"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Skift Kodeord"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Dit private nøgle kodeord stemmer ikke længere overens med dit login kodeord:"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "Sæt dit gamle private nøgle kodeord til at være dit nuværende login kodeord. "
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Hvis du ikke kan huske dit gamle kodeord kan du bede din administrator om at gendanne dine filer."
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Gammelt login kodeord"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Nuvrende login kodeord"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "Opdater Privat Nøgle Kodeord"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Aktiver kodeord gendannelse:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Aktivering af denne valgmulighed tillader dig at generhverve adgang til dine krypterede filer i tilfælde af tab af kodeord"
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "Filgendannelsesindstillinger opdateret"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "Kunne ikke opdatere filgendannelse"
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index d5bee700f160998ac0887c9058a1f6253215038c..5d390ef79e6591130d2dbc631d35d21e3e8f1e03 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/files_sharing.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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
-"Last-Translator: Sappe\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "Kodeordet er forkert. Prøv igen."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Kodeord"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Send"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Desværre, dette link ser ikke ud til at fungerer længere."
@@ -54,28 +54,28 @@ msgstr "deling er deaktiveret"
 msgid "For more info, please ask the person who sent this link."
 msgstr "For yderligere information, kontakt venligst personen der sendte linket. "
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s delte mappen %s med dig"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s delte filen %s med dig"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Download"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Upload"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Fortryd upload"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Forhåndsvisning ikke tilgængelig for"
diff --git a/l10n/da/files_trashbin.po b/l10n/da/files_trashbin.po
index 0e92e10c117775d4e00cc837aac61de081d37fc2..1b3a070cedafed8c8a7862ae9c20018111754bdf 100644
--- a/l10n/da/files_trashbin.po
+++ b/l10n/da/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: claus_chr <claus_chr@webspeed.dk>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,42 +29,10 @@ msgstr "Kunne ikke slette %s permanent"
 msgid "Couldn't restore %s"
 msgstr "Kunne ikke gendanne %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "udfør gendannelsesoperation"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Fejl"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "slet fil permanent"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Slet permanent"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Navn"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Slettet"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n mappe"
-msgstr[1] "%n mapper"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n fil"
-msgstr[1] "%n filer"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "Gendannet"
@@ -73,11 +41,19 @@ msgstr "Gendannet"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Intet at se her. Din papirkurv er tom!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Navn"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Gendan"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Slettet"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Slet"
 
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index a07b2cbf1cc29493f0f34ad0be4f1940af440fab..017dab47c3fa18845bb9470e0b7d8fb5b1f231c1 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: Sappe\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -369,14 +369,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -390,18 +394,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Test Konfiguration"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Hjælp"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 20b04a34fb023d4611c9e0a0f16b2f9fa2f0fee7..b3fb83b237b866140ee8f6ab015048885d3ed6c7 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -15,10 +15,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 21:20+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
-"Language-Team: German <translations@owncloud.org>\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -64,45 +64,6 @@ msgstr "Dateicache aktualisiert"
 msgid "... %d%% done ..."
 msgstr "... %d%% erledigt ..."
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Kategorie nicht angegeben."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Keine Kategorie hinzuzufügen?"
-
-#: ajax/vcategories/add.php:37
-#, 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
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Objekttyp nicht angegeben."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID nicht angegeben."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Fehler beim Hinzufügen von %s zu den Favoriten."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Es wurde keine Kategorien zum Löschen ausgewählt."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Fehler beim Entfernen von %s von den Favoriten."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Kein Bild oder Datei zur Verfügung gestellt"
@@ -319,27 +280,6 @@ msgstr "({count} ausgewählt)"
 msgid "Error loading file exists template"
 msgstr "Fehler beim Laden der vorhanden Dateivorlage"
 
-#: 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 "Der Objekttyp ist nicht angegeben."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Fehler"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Der App-Name ist nicht angegeben."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Die benötigte Datei {file} ist nicht installiert."
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Geteilt"
@@ -348,7 +288,12 @@ msgstr "Geteilt"
 msgid "Share"
 msgstr "Teilen"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Fehler"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Fehler beim Teilen"
 
@@ -380,7 +325,7 @@ msgstr "Über einen Link freigegeben"
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Passwort"
 
@@ -452,30 +397,58 @@ msgstr "löschen"
 msgid "share"
 msgstr "teilen"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Durch ein Passwort geschützt"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "E-Mail wurde verschickt"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Warnung"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Der Objekttyp ist nicht angegeben."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Löschen"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -512,7 +485,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Benutzername"
 
@@ -556,7 +529,7 @@ msgstr "Persönlich"
 msgid "Users"
 msgstr "Benutzer"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Apps"
 
@@ -568,6 +541,34 @@ msgstr "Administration"
 msgid "Help"
 msgstr "Hilfe"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Zugriff verboten"
@@ -597,14 +598,6 @@ msgstr "Die Freigabe wird ablaufen am %s.\n\n"
 msgid "Cheers!"
 msgstr "Hallo!"
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Kategorien bearbeiten"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Hinzufügen"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -694,12 +687,12 @@ msgstr "Installation abschließen"
 msgid "Finishing …"
 msgstr "Abschließen ..."
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Abmelden"
 
@@ -717,19 +710,27 @@ msgstr "Wenn Du Dein Passwort nicht vor kurzem geändert hast, könnte Dein\nAcc
 msgid "Please change your password to secure your account again."
 msgstr "Bitte ändere Dein Passwort, um Deinen Account wieder zu schützen."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr "Serverseitige Authentifizierung fehlgeschlagen!"
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr "Bitte kontaktiere Deinen Administrator."
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Passwort vergessen?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "merken"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Einloggen"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Alternative Logins"
 
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 542b1e6b713d66d47b27f1122ac974c0698928d9..c2e394a7cea1bce40ff5443fb5934cc20380adcb 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -13,10 +13,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 21:00+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+0000\n"
 "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
-"Language-Team: German <translations@owncloud.org>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -80,15 +80,15 @@ msgstr "Fehler beim Schreiben auf die Festplatte"
 msgid "Not enough storage available"
 msgstr "Nicht genug Speicher vorhanden."
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden."
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Hochladen fehlgeschlagen. Hochgeladene Datei konnte nicht gefunden werden."
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
@@ -96,36 +96,36 @@ msgstr "Ungültiges Verzeichnis."
 msgid "Files"
 msgstr "Dateien"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist"
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Nicht genug Speicherplatz verfügbar"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr "Ergebnis konnte nicht vom Server abgerufen werden."
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "Die URL darf nicht leer sein."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Der Ordnername ist ungültig. Nur ownCloud kann den Ordner \"Shared\" anlegen"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Fehler"
 
@@ -137,7 +137,7 @@ msgstr "Teilen"
 msgid "Delete permanently"
 msgstr "Endgültig löschen"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Umbenennen"
 
@@ -169,13 +169,13 @@ msgstr "{old_name} ersetzt durch {new_name}"
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n Ordner"
 msgstr[1] "%n Ordner"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n Datei"
@@ -232,25 +232,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind deine Dateien nach wie vor verschlüsselt. Bitte gehe zu deinen persönlichen Einstellungen, um deine Dateien zu entschlüsseln."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "Fehler beim Verschieben der Datei"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Geändert"
 
@@ -259,7 +259,7 @@ msgstr "Geändert"
 msgid "%s could not be renamed"
 msgstr "%s konnte nicht umbenannt werden"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Hochladen"
 
@@ -295,65 +295,65 @@ msgstr "Maximale Größe für ZIP-Dateien"
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Neu"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Textdatei"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Ordner"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Von einem Link"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Gelöschte Dateien"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Du hast hier keine Schreib-Berechtigung."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Lade etwas hoch!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Der Upload ist zu groß"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Scanne"
 
diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po
index 3599eb69e5ae04fac8b9f4a446d2214e2827f0c3..27b33b926e18fb2367350e564b1e23bd813ca39c 100644
--- a/l10n/de/files_encryption.po
+++ b/l10n/de/files_encryption.po
@@ -14,10 +14,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: German <translations@owncloud.org>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -60,14 +60,14 @@ msgid ""
 "correct."
 msgstr "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Eventuell war das alte Passwort falsch."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
-msgstr ""
+msgstr "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuche Dich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren."
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -75,6 +75,18 @@ msgid ""
 "files."
 msgstr "Dein privater Schlüssel ist ungültig. Möglicher Weise wurde von außerhalb Dein Passwort geändert (z.B. in deinem gemeinsamen Verzeichnis). Du kannst das Passwort deines privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an deine Dateien zu gelangen."
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "Fehlende Vorraussetzungen"
@@ -86,7 +98,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Bitte stelle sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert."
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:"
 
@@ -96,97 +108,97 @@ msgstr "Speichern..."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
-msgstr ""
+msgstr "Direkt wechseln zu Deinem"
 
 #: templates/invalid_private_key.php:8
 msgid "personal settings"
 msgstr "Private Einstellungen"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Wiederherstellungsschlüssel aktivieren (ermöglicht das Wiederherstellen von Dateien, falls das Passwort vergessen wurde):"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "Wiederherstellungsschlüssel-Passwort"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
-msgstr ""
+msgstr "Schlüssel-Passwort zur Wiederherstellung wiederholen"
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "Wiederherstellungsschlüssel-Passwort ändern:"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "Altes Wiederherstellungsschlüssel-Passwort"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "Neues Wiederherstellungsschlüssel-Passwort"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
-msgstr ""
+msgstr "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen"
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Ihr Passwort für ihren privaten Schlüssel stimmt nicht mehr mit ihrem Loginpasswort überein."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "Setzen Sie ihr altes Passwort für ihren privaten Schlüssel auf ihr aktuelles Login-Passwort"
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Wenn Sie Ihr altes Passwort vergessen haben, können Sie den Administrator bitten, Ihre Daten wiederherzustellen."
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Altes login Passwort"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Aktuelles Passwort"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "Passwort für den privaten Schlüssel aktualisieren"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Passwortwiederherstellung aktivvieren:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Wenn Sie diese Option aktivieren, können Sie Ihre verschlüsselten Dateien wiederherstellen, falls Sie Ihr Passwort vergessen"
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "Dateiwiederherstellung konnte nicht aktualisiert werden"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index ad1e84807eadd85a3bdfaba6db4ecc644bed0b83..1027eaf9e04043ff3604a0d122ee6c68b628e0c0 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 07:10+0000\n"
 "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
-"Language-Team: German <translations@owncloud.org>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,17 +20,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr "Diese Freigabe ist durch ein Passwort geschützt"
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "Bitte überprüfen sie Ihr Passwort und versuchen Sie es erneut."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Absenden"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren."
@@ -55,28 +55,28 @@ msgstr "Teilen ist deaktiviert"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Für mehr Informationen, frage bitte die Person, die dir diesen Link geschickt hat."
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s hat den Ordner %s mit Dir geteilt"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s hat die Datei %s mit Dir geteilt"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Download"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Hochladen"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Es ist keine Vorschau verfügbar für"
diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po
index f1cfe7ba75e8705246fa1acb08b369829136d219..c0cb7c8ca6cb501ba0fed9604422398566fcacfd 100644
--- a/l10n/de/files_trashbin.po
+++ b/l10n/de/files_trashbin.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: German <translations@owncloud.org>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,42 +28,10 @@ msgstr "Konnte %s nicht dauerhaft löschen"
 msgid "Couldn't restore %s"
 msgstr "Konnte %s nicht wiederherstellen"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "Wiederherstellung ausführen"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Fehler"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "Datei dauerhaft löschen"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Endgültig löschen"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Name"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "gelöscht"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] "%n Ordner"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] "%n Dateien"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "Wiederhergestellt"
@@ -72,11 +40,19 @@ msgstr "Wiederhergestellt"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Nichts zu löschen, der Papierkorb ist leer!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Name"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Wiederherstellen"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "gelöscht"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Löschen"
 
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index a1ea9218847cd3baefca70b1c002f93b243b26d7..5c3d79588dbb0730355bb48423ecf7526f6696ac 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -11,10 +11,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 07:10+0000\n"
 "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
-"Language-Team: German <translations@owncloud.org>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -372,14 +372,18 @@ msgid ""
 msgstr "Standardmäßig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Außerdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Du musst allerdings sicherstellen, dass deine gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lasse es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus."
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "UUID-Attribut:"
+msgid "UUID Attribute for Users:"
+msgstr "UUID-Attribute für Benutzer:"
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr "UUID-Attribute für Gruppen:"
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -393,18 +397,18 @@ msgid ""
 "experimental stage."
 msgstr "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Lösche die Zuordnungen nur in einer Test- oder Experimentierumgebung."
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Lösche LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Lösche LDAP-Gruppennamenzuordnung"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Testkonfiguration"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Hilfe"
diff --git a/l10n/de_AT/core.po b/l10n/de_AT/core.po
index ced7aed5831c31583fbf41bc7511d1adfca71178..337f754b8662990e7d42bad8dd936fccf650c326 100644
--- a/l10n/de_AT/core.po
+++ b/l10n/de_AT/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
@@ -57,45 +57,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -312,27 +273,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -341,7 +281,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr ""
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -373,7 +318,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr ""
 
@@ -445,30 +390,58 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -505,7 +478,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr ""
 
@@ -549,7 +522,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr ""
 
@@ -561,6 +534,34 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -590,14 +591,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr ""
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -687,12 +680,12 @@ msgstr ""
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr ""
 
@@ -710,19 +703,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/de_AT/files_encryption.po b/l10n/de_AT/files_encryption.po
index a256dd9d3e796655bf4e70645682a28a571ad0d8..438f7ac71726bfaf20daf98b0a50eb78904408da 100644
--- a/l10n/de_AT/files_encryption.po
+++ b/l10n/de_AT/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/de_AT/files_sharing.po b/l10n/de_AT/files_sharing.po
index 4e09271a0bb84356cb339d02ff9d3634b030c4b8..3d9319183c71aa5ab858a857e4fad2990f6b2d93 100644
--- a/l10n/de_AT/files_sharing.po
+++ b/l10n/de_AT/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 09:02+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
-msgid "Password"
+msgid "The password is wrong. Try again."
 msgstr ""
 
-#: templates/authenticate.php:9
-msgid "Submit"
+#: templates/authenticate.php:10
+msgid "Password"
 msgstr ""
 
 #: templates/part.404.php:3
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:85
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/de_AT/files_trashbin.po b/l10n/de_AT/files_trashbin.po
index a05dc1411b2fa2608006ab8174e61bed04c8aace..9f2eb2716b2ea79ccbdbd780f12e13742271f6e3 100644
--- a/l10n/de_AT/files_trashbin.po
+++ b/l10n/de_AT/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-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
@@ -27,55 +27,31 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:100
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:36
-msgid "delete file permanently"
+#: lib/trashbin.php:814 lib/trashbin.php:816
+msgid "restored"
 msgstr ""
 
-#: js/trash.js:127
-msgid "Delete permanently"
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: js/trash.js:182 templates/index.php:17
+#: templates/index.php:23
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:183 templates/index.php:27
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:191
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:197
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/trash.php:819 lib/trash.php:821
-msgid "restored"
-msgstr ""
-
-#: templates/index.php:9
-msgid "Nothing in here. Your trash bin is empty!"
+#: templates/index.php:26 templates/index.php:28
+msgid "Restore"
 msgstr ""
 
-#: templates/index.php:20 templates/index.php:22
-msgid "Restore"
+#: templates/index.php:34
+msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:30 templates/index.php:31
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr ""
 
diff --git a/l10n/de_AT/user_ldap.po b/l10n/de_AT/user_ldap.po
index affcff22fbecefc97306676190f9a45f935d1ac3..f0ccd0d18fed5a5f57e735c83ab2f0ca7e5937fb 100644
--- a/l10n/de_AT/user_ldap.po
+++ b/l10n/de_AT/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:36
+#: ajax/testConfiguration.php:37
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:39
+#: ajax/testConfiguration.php:40
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:43
+#: ajax/testConfiguration.php:44
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr ""
diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po
index 09a9997b11bab46518fecf411f9c2c8b8a405c80..17e6ee20121fc10a72cf595570b6cafb1fdc54a0 100644
--- a/l10n/de_CH/core.po
+++ b/l10n/de_CH/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
@@ -65,45 +65,6 @@ msgstr ""
 msgid "... %d%% done ..."
 msgstr ""
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Kategorie nicht angegeben."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Keine Kategorie hinzuzufügen?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Die nachfolgende Kategorie existiert bereits: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Objekttyp nicht angegeben."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID nicht angegeben."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Fehler beim Hinzufügen von %s zu den Favoriten."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Es wurden keine Kategorien zum Löschen ausgewählt."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Fehler beim Entfernen von %s von den Favoriten."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -320,27 +281,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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 "Der Objekttyp ist nicht angegeben."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Fehler"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Der App-Name ist nicht angegeben."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Die benötigte Datei {file} ist nicht installiert!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Geteilt"
@@ -349,7 +289,12 @@ msgstr "Geteilt"
 msgid "Share"
 msgstr "Teilen"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Fehler"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Fehler beim Teilen"
 
@@ -381,7 +326,7 @@ msgstr "Über einen Link teilen"
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Passwort"
 
@@ -453,30 +398,58 @@ msgstr "löschen"
 msgid "share"
 msgstr "teilen"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Passwortgeschützt"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Email gesendet"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Warnung"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Der Objekttyp ist nicht angegeben."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Löschen"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -513,7 +486,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Benutzername"
 
@@ -557,7 +530,7 @@ msgstr "Persönlich"
 msgid "Users"
 msgstr "Benutzer"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Apps"
 
@@ -569,6 +542,34 @@ msgstr "Administrator"
 msgid "Help"
 msgstr "Hilfe"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Zugriff verboten"
@@ -598,14 +599,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Kategorien ändern"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Hinzufügen"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -695,12 +688,12 @@ msgstr "Installation abschliessen"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Abmelden"
 
@@ -718,19 +711,27 @@ msgstr "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAcc
 msgid "Please change your password to secure your account again."
 msgstr "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Passwort vergessen?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "merken"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Einloggen"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Alternative Logins"
 
diff --git a/l10n/de_CH/files.po b/l10n/de_CH/files.po
index b625a8b5e4d089c7e7af1564a4a020a58545e9e2..dfd47931e4c43d468df1c46a5087b1d5a2936379 100644
--- a/l10n/de_CH/files.po
+++ b/l10n/de_CH/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
@@ -83,15 +83,15 @@ msgstr "Fehler beim Schreiben auf die Festplatte"
 msgid "Not enough storage available"
 msgstr "Nicht genug Speicher vorhanden."
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
@@ -99,36 +99,36 @@ msgstr "Ungültiges Verzeichnis."
 msgid "Files"
 msgstr "Dateien"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Nicht genügend Speicherplatz verfügbar"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "Die URL darf nicht leer sein."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Ungültiger Ordnername. Die Verwendung von «Shared» ist ownCloud vorbehalten."
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Fehler"
 
@@ -140,7 +140,7 @@ msgstr "Teilen"
 msgid "Delete permanently"
 msgstr "Endgültig löschen"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Umbenennen"
 
@@ -172,13 +172,13 @@ msgstr "{old_name} wurde ersetzt durch {new_name}"
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] "%n Ordner"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -235,25 +235,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Ihr Download wird vorbereitet. Dies kann bei grösseren Dateien etwas dauern."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Grösse"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Geändert"
 
@@ -262,7 +262,7 @@ msgstr "Geändert"
 msgid "%s could not be renamed"
 msgstr "%s konnte nicht umbenannt werden"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Hochladen"
 
@@ -298,65 +298,65 @@ msgstr "Maximale Grösse für ZIP-Dateien"
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Neu"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Textdatei"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Ordner"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Von einem Link"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Gelöschte Dateien"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Sie haben hier keine Schreib-Berechtigungen."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Laden Sie etwas hoch!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Der Upload ist zu gross"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Die Datei überschreitet die Maximalgrösse für Uploads auf diesem Server."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Scanne"
 
diff --git a/l10n/de_CH/files_encryption.po b/l10n/de_CH/files_encryption.po
index 80f813910e100e452c31329ee33b30fce30fc656..1e6752c56137f69c693c83697fa6af73bc40111d 100644
--- a/l10n/de_CH/files_encryption.po
+++ b/l10n/de_CH/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
@@ -59,14 +59,14 @@ msgid ""
 "correct."
 msgstr "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -74,6 +74,18 @@ msgid ""
 "files."
 msgstr "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde von ausserhalb Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen."
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "Fehlende Voraussetzungen"
@@ -85,7 +97,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert."
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:"
 
@@ -101,91 +113,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "Persönliche Einstellungen"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht)."
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "Wiederherstellungschlüsselpasswort"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "Wiederherstellungsschlüsselpasswort ändern"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "Altes Wiederherstellungsschlüsselpasswort"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "Neues Wiederherstellungsschlüsselpasswort "
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Das Privatschlüsselpasswort darf nicht länger mit den Login-Passwort übereinstimmen."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "Setzen Sie Ihr altes Privatschlüsselpasswort auf Ihr aktuelles LogIn-Passwort."
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen."
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Altes Login-Passwort"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Momentanes Login-Passwort"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "Das Passwort des privaten Schlüssels aktualisieren"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Die Passwort-Wiederherstellung aktivieren:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert."
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
diff --git a/l10n/de_CH/files_sharing.po b/l10n/de_CH/files_sharing.po
index 8616c16eb645c54d4bac9be4fce641bf96b2d2b6..d4bb9004550520af51b81db9f8fcddff0d55cc70 100644
--- a/l10n/de_CH/files_sharing.po
+++ b/l10n/de_CH/files_sharing.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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
-"Last-Translator: FlorianScholz <work@bgstyle.de>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,17 +21,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "Das Passwort ist falsch. Bitte versuchen Sie es erneut."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Bestätigen"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren."
@@ -56,28 +56,28 @@ msgstr "Teilen ist deaktiviert"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat."
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s hat den Ordner %s mit Ihnen geteilt"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s hat die Datei %s mit Ihnen geteilt"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Hochladen"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Es ist keine Vorschau verfügbar für"
diff --git a/l10n/de_CH/files_trashbin.po b/l10n/de_CH/files_trashbin.po
index 2682be087d226218269183286aae9ea886ef85ee..0f68a05e2a15c39f3c25e76bd0fb875f0d3835a1 100644
--- a/l10n/de_CH/files_trashbin.po
+++ b/l10n/de_CH/files_trashbin.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: FlorianScholz <work@bgstyle.de>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,42 +30,10 @@ msgstr "Konnte %s nicht dauerhaft löschen"
 msgid "Couldn't restore %s"
 msgstr "Konnte %s nicht wiederherstellen"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "Wiederherstellung ausführen"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Fehler"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "Datei dauerhaft löschen"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Endgültig löschen"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Name"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Gelöscht"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n Ordner"
-msgstr[1] "%n Ordner"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n Datei"
-msgstr[1] "%n Dateien"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "Wiederhergestellt"
@@ -74,11 +42,19 @@ msgstr "Wiederhergestellt"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Nichts zu löschen, Ihr Papierkorb ist leer!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Name"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Wiederherstellen"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Gelöscht"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Löschen"
 
diff --git a/l10n/de_CH/user_ldap.po b/l10n/de_CH/user_ldap.po
index 203b73cdf5332cb9b2267ca99e1c95f38f8fa961..7c509f7224164cbafb7520b7a86bf5a3fea5030d 100644
--- a/l10n/de_CH/user_ldap.po
+++ b/l10n/de_CH/user_ldap.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: FlorianScholz <work@bgstyle.de>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -376,14 +376,18 @@ msgid ""
 msgstr "Standardmässig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Ausserdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie müssen allerdings sicherstellen, dass Ihre gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus."
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "UUID-Attribut:"
+msgid "UUID Attribute for Users:"
+msgstr ""
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -397,18 +401,18 @@ msgid ""
 "experimental stage."
 msgstr "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Löschen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung."
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Lösche LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Lösche LDAP-Gruppennamenzuordnung"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Testkonfiguration"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Hilfe"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index 464c953b3dab20b7483bec9709222649a74295a5..e35a1c505343ad544cb51e0166f43076a2c4d9ac 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -15,10 +15,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 21:20+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
-"Language-Team: German (Germany) <translations@owncloud.org>\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -64,45 +64,6 @@ msgstr "Dateicache aktualisiert"
 msgid "... %d%% done ..."
 msgstr "... %d%% erledigt ..."
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Kategorie nicht angegeben."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Keine Kategorie hinzuzufügen?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Die nachfolgende Kategorie existiert bereits: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Objekttyp nicht angegeben."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID nicht angegeben."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Fehler beim Hinzufügen von %s zu den Favoriten."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Es wurden keine Kategorien zum Löschen ausgewählt."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Fehler beim Entfernen von %s von den Favoriten."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Kein Bild oder Datei zur Verfügung gestellt"
@@ -319,27 +280,6 @@ msgstr "({count} ausgewählt)"
 msgid "Error loading file exists template"
 msgstr "Fehler beim Laden der vorhanden Dateivorlage"
 
-#: 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 "Der Objekttyp ist nicht angegeben."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Fehler"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Der App-Name ist nicht angegeben."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Die benötigte Datei {file} ist nicht installiert!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Geteilt"
@@ -348,7 +288,12 @@ msgstr "Geteilt"
 msgid "Share"
 msgstr "Teilen"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Fehler"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Fehler beim Teilen"
 
@@ -380,7 +325,7 @@ msgstr "Über einen Link teilen"
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Passwort"
 
@@ -452,30 +397,58 @@ msgstr "löschen"
 msgid "share"
 msgstr "teilen"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Passwortgeschützt"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Email gesendet"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Warnung"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Der Objekttyp ist nicht angegeben."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Löschen"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -512,7 +485,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Benutzername"
 
@@ -556,7 +529,7 @@ msgstr "Persönlich"
 msgid "Users"
 msgstr "Benutzer"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Apps"
 
@@ -568,6 +541,34 @@ msgstr "Administrator"
 msgid "Help"
 msgstr "Hilfe"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Zugriff verboten"
@@ -597,14 +598,6 @@ msgstr "Die Freigabe wird ablaufen am %s.\n\n"
 msgid "Cheers!"
 msgstr "Hallo!"
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Kategorien ändern"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Hinzufügen"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -694,12 +687,12 @@ msgstr "Installation abschließen"
 msgid "Finishing …"
 msgstr "Abschließen ..."
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Abmelden"
 
@@ -717,19 +710,27 @@ msgstr "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAcc
 msgid "Please change your password to secure your account again."
 msgstr "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr "Serverseitige Authentifizierung fehlgeschlagen!"
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr "Bitte kontaktieren Sie Ihren Administrator."
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Passwort vergessen?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "merken"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Einloggen"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Alternative Logins"
 
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 9990d482852bd8ea93bccaf0afcb72db0a42d187..19558af55bad5688ce140126203603858625b282 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -16,10 +16,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 21:00+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+0000\n"
 "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
-"Language-Team: German (Germany) <translations@owncloud.org>\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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -83,15 +83,15 @@ msgstr "Fehler beim Schreiben auf die Festplatte"
 msgid "Not enough storage available"
 msgstr "Nicht genug Speicher vorhanden."
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden."
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Hochladen fehlgeschlagen. Hochgeladene Datei konnte nicht gefunden werden."
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
@@ -99,36 +99,36 @@ msgstr "Ungültiges Verzeichnis."
 msgid "Files"
 msgstr "Dateien"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist"
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Nicht genügend Speicherplatz verfügbar"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr "Ergebnis konnte nicht vom Server abgerufen werden."
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "Die URL darf nicht leer sein."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten."
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Fehler"
 
@@ -140,7 +140,7 @@ msgstr "Teilen"
 msgid "Delete permanently"
 msgstr "Endgültig löschen"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Umbenennen"
 
@@ -172,13 +172,13 @@ msgstr "{old_name} wurde ersetzt durch {new_name}"
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n Ordner"
 msgstr[1] "%n Ordner"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n Datei"
@@ -235,25 +235,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "Fehler beim Verschieben der Datei"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Geändert"
 
@@ -262,7 +262,7 @@ msgstr "Geändert"
 msgid "%s could not be renamed"
 msgstr "%s konnte nicht umbenannt werden"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Hochladen"
 
@@ -298,65 +298,65 @@ msgstr "Maximale Größe für ZIP-Dateien"
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Neu"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Textdatei"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Ordner"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Von einem Link"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Gelöschte Dateien"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Sie haben hier keine Schreib-Berechtigungen."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Laden Sie etwas hoch!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Der Upload ist zu groß"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Scanne"
 
diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po
index d5577daf9208e2e4771adf5c28e734834abbdb01..bce51625906aa6935f379b43c143ec67d58ee09b 100644
--- a/l10n/de_DE/files_encryption.po
+++ b/l10n/de_DE/files_encryption.po
@@ -11,10 +11,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: German (Germany) <translations@owncloud.org>\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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,14 +57,14 @@ msgid ""
 "correct."
 msgstr "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
-msgstr ""
+msgstr "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuchen Sie sich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren."
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -72,6 +72,18 @@ msgid ""
 "files."
 msgstr "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde von außerhalb Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen."
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "Fehlende Voraussetzungen"
@@ -83,7 +95,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert."
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:"
 
@@ -93,97 +105,97 @@ msgstr "Speichern..."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
-msgstr ""
+msgstr "Direkt wechseln zu Ihrem"
 
 #: templates/invalid_private_key.php:8
 msgid "personal settings"
 msgstr "Persönliche Einstellungen"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht)."
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "Wiederherstellungschlüsselpasswort"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
-msgstr ""
+msgstr "Schlüssel-Passwort zur Wiederherstellung wiederholen"
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "Wiederherstellungsschlüsselpasswort ändern"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "Altes Wiederherstellungsschlüsselpasswort"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "Neues Wiederherstellungsschlüsselpasswort "
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
-msgstr ""
+msgstr "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen"
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Das Privatschlüsselpasswort darf nicht länger mit den Login-Passwort übereinstimmen."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "Setzen Sie Ihr altes Privatschlüsselpasswort auf Ihr aktuelles LogIn-Passwort."
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen."
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Altes Login-Passwort"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Momentanes Login-Passwort"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "Das Passwort des privaten Schlüssels aktualisieren"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Die Passwort-Wiederherstellung aktivieren:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert."
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
diff --git a/l10n/de_DE/files_sharing.po b/l10n/de_DE/files_sharing.po
index efed1ad727abc30ef95b3a79a74f661965b1083c..53dbe4fcc315fbd597e11d49a3269d4cfff047f5 100644
--- a/l10n/de_DE/files_sharing.po
+++ b/l10n/de_DE/files_sharing.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 07:10+0000\n"
 "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
-"Language-Team: German (Germany) <translations@owncloud.org>\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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,17 +20,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr "Diese Freigabe ist durch ein Passwort geschützt"
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "Das Passwort ist falsch. Bitte versuchen Sie es erneut."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Bestätigen"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren."
@@ -55,28 +55,28 @@ msgstr "Teilen ist deaktiviert"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat."
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s hat den Ordner %s mit Ihnen geteilt"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s hat die Datei %s mit Ihnen geteilt"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Hochladen"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Es ist keine Vorschau verfügbar für"
diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po
index 0f2bea561273999b44d5dafd971b7115af536b9d..3b16695d14424e1ae51c5fc22dddbd8aae1bdb29 100644
--- a/l10n/de_DE/files_trashbin.po
+++ b/l10n/de_DE/files_trashbin.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: noxin <transifex.com@davidmainzer.com>\n"
-"Language-Team: German (Germany) <translations@owncloud.org>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,42 +29,10 @@ msgstr "Konnte %s nicht dauerhaft löschen"
 msgid "Couldn't restore %s"
 msgstr "Konnte %s nicht wiederherstellen"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "Wiederherstellung ausführen"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Fehler"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "Datei dauerhaft löschen"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Endgültig löschen"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Name"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Gelöscht"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n Ordner"
-msgstr[1] "%n Ordner"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n Dateien"
-msgstr[1] "%n Dateien"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "Wiederhergestellt"
@@ -73,11 +41,19 @@ msgstr "Wiederhergestellt"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Nichts zu löschen, Ihr Papierkorb ist leer!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Name"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Wiederherstellen"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Gelöscht"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Löschen"
 
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 659a5d690a8714975ef5e4ea2f13275f05aa693e..81d053ac5020c8086268bc9dd9a9548709a4669b 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -13,10 +13,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: noxin <transifex.com@davidmainzer.com>\n"
-"Language-Team: German (Germany) <translations@owncloud.org>\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 07:10+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -374,14 +374,18 @@ msgid ""
 msgstr "Standardmäßig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Außerdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie müssen allerdings sicherstellen, dass Ihre gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus."
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "UUID-Attribut:"
+msgid "UUID Attribute for Users:"
+msgstr "UUID-Attribute für Benutzer:"
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr "UUID-Attribute für Gruppen:"
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -395,18 +399,18 @@ msgid ""
 "experimental stage."
 msgstr "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Löschen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung."
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Lösche LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Lösche LDAP-Gruppennamenzuordnung"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Testkonfiguration"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Hilfe"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index ec1d3e4e46e5b150b3b761cd7c1634771b71bdec..aa616baff2eb9800678f47465875126a1bb43cf8 100644
--- a/l10n/el/core.po
+++ b/l10n/el/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:31+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -63,45 +63,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 "Αυτή η κατηγορία υπάρχει ήδη: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Δεν δώθηκε τύπος αντικειμένου."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "Δεν δώθηκε η ID για %s."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Σφάλμα προσθήκης %s στα αγαπημένα."
-
-#: 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 "Σφάλμα αφαίρεσης %s από τα αγαπημένα."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -318,27 +279,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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 "Το απαιτούμενο αρχείο {file} δεν εγκαταστάθηκε!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Κοινόχρηστα"
@@ -347,7 +287,12 @@ msgstr "Κοινόχρηστα"
 msgid "Share"
 msgstr "Διαμοιρασμός"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Σφάλμα κατά τον διαμοιρασμό"
 
@@ -379,7 +324,7 @@ msgstr "Διαμοιρασμός με σύνδεσμο"
 msgid "Password protect"
 msgstr "Προστασία συνθηματικού"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Συνθηματικό"
 
@@ -451,30 +396,58 @@ msgstr "διαγραφή"
 msgid "share"
 msgstr "διαμοιρασμός"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Προστασία με συνθηματικό"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Σφάλμα κατά την διαγραφή της ημ. λήξης"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Σφάλμα κατά τον ορισμό ημ. λήξης"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Αποστολή..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Το Email απεστάλη "
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Δεν καθορίστηκε ο τύπος του αντικειμένου."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Διαγραφή"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Προσθήκη"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -511,7 +484,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Όνομα χρήστη"
 
@@ -555,7 +528,7 @@ msgstr "Προσωπικά"
 msgid "Users"
 msgstr "Χρήστες"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Εφαρμογές"
 
@@ -567,6 +540,34 @@ msgstr "Διαχειριστής"
 msgid "Help"
 msgstr "Βοήθεια"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Δεν επιτρέπεται η πρόσβαση"
@@ -596,14 +597,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Επεξεργασία κατηγοριών"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Προσθήκη"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -693,12 +686,12 @@ msgstr "Ολοκλήρωση εγκατάστασης"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες στο πώς να αναβαθμίσετε."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Αποσύνδεση"
 
@@ -716,19 +709,27 @@ msgstr "Εάν δεν αλλάξατε το συνθηματικό σας προ
 msgid "Please change your password to secure your account again."
 msgstr "Παρακαλώ αλλάξτε το συνθηματικό σας για να ασφαλίσετε πάλι τον λογαριασμό σας."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Ξεχάσατε το συνθηματικό σας;"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "απομνημόνευση"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Είσοδος"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Εναλλακτικές Συνδέσεις"
 
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 8794c5a9de2d761308cf349950b8486b3f2fec99..6a607e5667bf74ed5ab562f21333ba0fe7f67f8c 100644
--- a/l10n/el/files.po
+++ b/l10n/el/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -78,15 +78,15 @@ msgstr "Αποτυχία εγγραφής στο δίσκο"
 msgid "Not enough storage available"
 msgstr "Μη επαρκής διαθέσιμος αποθηκευτικός χώρος"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Μη έγκυρος φάκελος."
 
@@ -94,36 +94,36 @@ msgstr "Μη έγκυρος φάκελος."
 msgid "Files"
 msgstr "Αρχεία"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Δεν υπάρχει αρκετός διαθέσιμος χώρος"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Η αποστολή ακυρώθηκε."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "Η URL δεν μπορεί να είναι κενή."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από το ownCloud"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -135,7 +135,7 @@ msgstr "Διαμοιρασμός"
 msgid "Delete permanently"
 msgstr "Μόνιμη διαγραφή"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Μετονομασία"
 
@@ -167,13 +167,13 @@ msgstr "αντικαταστάθηκε το {new_name} με {old_name}"
 msgid "undo"
 msgstr "αναίρεση"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n φάκελος"
 msgstr[1] "%n φάκελοι"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n αρχείο"
@@ -230,25 +230,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Η κρυπτογράφηση απενεργοποιήθηκε, αλλά τα αρχεία σας είναι ακόμα κρυπτογραφημένα. Παρακαλούμε απενεργοποιήσετε την κρυπτογράφηση αρχείων από τις προσωπικές σας ρυθμίσεις"
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "Σφάλμα κατά τη μετακίνηση του αρχείου"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Όνομα"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Τροποποιήθηκε"
 
@@ -257,7 +257,7 @@ msgstr "Τροποποιήθηκε"
 msgid "%s could not be renamed"
 msgstr "Αδυναμία μετονομασίας του %s"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Μεταφόρτωση"
 
@@ -293,65 +293,65 @@ msgstr "Μέγιστο μέγεθος για αρχεία ZIP"
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Νέο"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Αρχείο κειμένου"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Φάκελος"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Από σύνδεσμο"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Διαγραμμένα αρχεία"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Ακύρωση αποστολής"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Δεν έχετε δικαιώματα εγγραφής εδώ."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Δεν υπάρχει τίποτα εδώ. Ανεβάστε κάτι!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Λήψη"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Σταμάτημα διαμοιρασμού"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Πολύ μεγάλο αρχείο προς αποστολή"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Τρέχουσα ανίχνευση"
 
diff --git a/l10n/el/files_encryption.po b/l10n/el/files_encryption.po
index c960ab2c37e1468baa270bf26f9872f33f41e2be..d198fe0332b563b1cf5fb8f647b2f882a0054ef6 100644
--- a/l10n/el/files_encryption.po
+++ b/l10n/el/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -56,14 +56,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -71,6 +71,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -82,7 +94,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -98,91 +110,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "προσωπικές ρυθμίσεις"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Κρυπτογράφηση"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Ενεργοποιημένο"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Απενεργοποιημένο"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Αλλαγή Κωδικού Πρόσβασης"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "Οι ρυθμίσεις επαναφοράς αρχείων ανανεώθηκαν"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index 7185b97f8542ceb6aad14ab2682e3293494bb011..716a96b395c76ee545643e2eefecae3632e806bd 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/files_sharing.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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
-"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "Εσφαλμένο συνθηματικό. Προσπαθήστε ξανά."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Συνθηματικό"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Καταχώρηση"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Συγγνώμη, αυτός ο σύνδεσμος μοιάζει να μην ισχύει πια."
@@ -54,28 +54,28 @@ msgstr "ο διαμοιρασμός απενεργοποιήθηκε"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Για περισσότερες πληροφορίες, παρακαλώ ρωτήστε το άτομο που σας έστειλε αυτόν τον σύνδεσμο."
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s μοιράστηκε τον φάκελο %s μαζί σας"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s μοιράστηκε το αρχείο %s μαζί σας"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Λήψη"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Μεταφόρτωση"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Ακύρωση αποστολής"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Δεν υπάρχει διαθέσιμη προεπισκόπηση για"
diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po
index e70d23893912f085ea3d65c160be28d1de8d6d8a..f07c85f81cf1cc5bb58654b2d4804dd36b5b664e 100644
--- a/l10n/el/files_trashbin.po
+++ b/l10n/el/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -28,42 +28,10 @@ msgstr "Αδύνατη η μόνιμη διαγραφή του %s"
 msgid "Couldn't restore %s"
 msgstr "Αδυναμία επαναφοράς %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "εκτέλεση λειτουργία επαναφοράς"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "μόνιμη διαγραφή αρχείου"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Μόνιμη διαγραφή"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Όνομα"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Διαγράφηκε"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] "%n φάκελοι"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] "%n αρχεία"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "έγινε επαναφορά"
@@ -72,11 +40,19 @@ msgstr "έγινε επαναφορά"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Δεν υπάρχει τίποτα εδώ. Ο κάδος σας είναι άδειος!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Όνομα"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Επαναφορά"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Διαγράφηκε"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Διαγραφή"
 
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 1385bd0c1219941076dbf79c8583c9d5c132bcd8..4d916b51c6985caf8cb81dcb0ebdc1840dec2bde 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Δοκιμαστικες ρυθμισεις"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Βοήθεια"
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index e91092cdc4076bac3cf2194ee0ae8b701fd4d0f4..ff64e18245e603ed59c0215a8cb7a3788a402425 100644
--- a/l10n/en@pirate/core.po
+++ b/l10n/en@pirate/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -57,45 +57,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -312,27 +273,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -341,7 +281,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr ""
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -373,7 +318,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Passcode"
 
@@ -445,30 +390,58 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -505,7 +478,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr ""
 
@@ -549,7 +522,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr ""
 
@@ -561,6 +534,34 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -590,14 +591,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr ""
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -687,12 +680,12 @@ msgstr ""
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr ""
 
@@ -710,19 +703,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/en@pirate/files_encryption.po b/l10n/en@pirate/files_encryption.po
index 8aec124f55e326e2a70322e74e0a5cea106603f5..9bfc0098954591805d2a9b7147f050dd434a5466 100644
--- a/l10n/en@pirate/files_encryption.po
+++ b/l10n/en@pirate/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/en@pirate/files_sharing.po b/l10n/en@pirate/files_sharing.po
index 4663eb69623970ef2a1c08a6cf50704fab201adb..373e6b706f5f31acc4c7857e44a5836b823685d5 100644
--- a/l10n/en@pirate/files_sharing.po
+++ b/l10n/en@pirate/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Secret Code"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Submit"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -54,28 +54,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s shared the folder %s with you"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s shared the file %s with you"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Download"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "No preview available for"
diff --git a/l10n/en@pirate/files_trashbin.po b/l10n/en@pirate/files_trashbin.po
index c64e4f7a6a29c9033f674ed514bdbdf9be53542f..416897b2d20a7df7632dd484304555d74918f48a 100644
--- a/l10n/en@pirate/files_trashbin.po
+++ b/l10n/en@pirate/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-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -27,55 +27,31 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:100
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:36
-msgid "delete file permanently"
+#: lib/trashbin.php:814 lib/trashbin.php:816
+msgid "restored"
 msgstr ""
 
-#: js/trash.js:127
-msgid "Delete permanently"
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: js/trash.js:182 templates/index.php:17
+#: templates/index.php:23
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:183 templates/index.php:27
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:191
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:197
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/trash.php:819 lib/trash.php:821
-msgid "restored"
-msgstr ""
-
-#: templates/index.php:9
-msgid "Nothing in here. Your trash bin is empty!"
+#: templates/index.php:26 templates/index.php:28
+msgid "Restore"
 msgstr ""
 
-#: templates/index.php:20 templates/index.php:22
-msgid "Restore"
+#: templates/index.php:34
+msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:30 templates/index.php:31
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr ""
 
diff --git a/l10n/en@pirate/user_ldap.po b/l10n/en@pirate/user_ldap.po
index 22391f10ba9c2d78534d6df9205a818211b69c09..49dd166b04416173b21b9e0e4486099a1ca0a3d7 100644
--- a/l10n/en@pirate/user_ldap.po
+++ b/l10n/en@pirate/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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:36
+#: ajax/testConfiguration.php:37
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:39
+#: ajax/testConfiguration.php:40
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:43
+#: ajax/testConfiguration.php:44
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr ""
diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po
index 50e3e524ef45ee4b1ba1f058082ff662a71d7ab9..4459b0ba23fbf07a4daa72728eed82b8c36c39b7 100644
--- a/l10n/en_GB/core.po
+++ b/l10n/en_GB/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:31+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "%s shared \"%s\" with you"
 #: ajax/share.php:168
 #, php-format
 msgid "Couldn't send mail to following users: %s "
-msgstr ""
+msgstr "Couldn't send mail to following users: %s "
 
 #: ajax/share.php:327
 msgid "group"
@@ -57,45 +57,6 @@ msgstr "Updated filecache"
 msgid "... %d%% done ..."
 msgstr "... %d%% done ..."
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Category type not provided."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "No category to add?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "This category already exists: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Object type not provided."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID not provided."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Error adding %s to favourites."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "No categories selected for deletion."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Error removing %s from favourites."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "No image or file provided"
@@ -312,27 +273,6 @@ msgstr "({count} selected)"
 msgid "Error loading file exists template"
 msgstr "Error loading file exists template"
 
-#: 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 "The object type is not specified."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Error"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "The app name is not specified."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "The required file {file} is not installed!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Shared"
@@ -341,7 +281,12 @@ msgstr "Shared"
 msgid "Share"
 msgstr "Share"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Error"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Error whilst sharing"
 
@@ -373,7 +318,7 @@ msgstr "Share with link"
 msgid "Password protect"
 msgstr "Password protect"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Password"
 
@@ -419,7 +364,7 @@ msgstr "Unshare"
 
 #: js/share.js:353
 msgid "notify user by email"
-msgstr ""
+msgstr "notify user by email"
 
 #: js/share.js:361
 msgid "can edit"
@@ -445,30 +390,58 @@ msgstr "delete"
 msgid "share"
 msgstr "share"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Password protected"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Error unsetting expiration date"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Error setting expiration date"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Sending ..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Email sent"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Warning"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "The object type is not specified."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Delete"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Add"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -505,7 +478,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "You will receive a link to reset your password via email."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Username"
 
@@ -549,7 +522,7 @@ msgstr "Personal"
 msgid "Users"
 msgstr "Users"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Apps"
 
@@ -561,6 +534,34 @@ msgstr "Admin"
 msgid "Help"
 msgstr "Help"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Access denied"
@@ -577,26 +578,18 @@ msgid ""
 "just letting you know that %s shared %s with you.\n"
 "View it: %s\n"
 "\n"
-msgstr ""
+msgstr "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n"
 
 #: templates/altmail.php:4
 #, php-format
 msgid ""
 "The share will expire on %s.\n"
 "\n"
-msgstr ""
+msgstr "The share will expire on %s.\n\n"
 
 #: templates/altmail.php:6 templates/mail.php:19
 msgid "Cheers!"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Edit categories"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Add"
+msgstr "Cheers!"
 
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
@@ -685,14 +678,14 @@ msgstr "Finish setup"
 
 #: templates/installation.php:184
 msgid "Finishing …"
-msgstr ""
+msgstr "Finishing …"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s is available. Get more information on how to update."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Log out"
 
@@ -710,19 +703,27 @@ msgstr "If you did not change your password recently, your account may be compro
 msgid "Please change your password to secure your account again."
 msgstr "Please change your password to secure your account again."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr "Server side authentication failed!"
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr "Please contact your administrator."
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Lost your password?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "remember"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Log in"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Alternative Logins"
 
@@ -731,12 +732,12 @@ msgstr "Alternative Logins"
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>"
-msgstr ""
+msgstr "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>"
 
 #: templates/mail.php:17
 #, php-format
 msgid "The share will expire on %s.<br><br>"
-msgstr ""
+msgstr "The share will expire on %s.<br><br>"
 
 #: templates/update.php:3
 #, php-format
diff --git a/l10n/en_GB/files.po b/l10n/en_GB/files.po
index e65d6cb2489bcbb33f52e17551001af3b481aaaa..5161cb6041d74a4591e15af2f88aabb271e47b95 100644
--- a/l10n/en_GB/files.po
+++ b/l10n/en_GB/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+0000\n"
+"Last-Translator: mnestis <transifex@mnestis.net>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -75,15 +75,15 @@ msgstr "Failed to write to disk"
 msgid "Not enough storage available"
 msgstr "Not enough storage available"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr "Upload failed. Could not get file info."
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Upload failed. Could not find uploaded file"
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Invalid directory."
 
@@ -91,36 +91,36 @@ msgstr "Invalid directory."
 msgid "Files"
 msgstr "Files"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Unable to upload {filename} as it is a directory or has 0 bytes"
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Not enough space available"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Upload cancelled."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr "Could not get result from server."
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "File upload is in progress. Leaving the page now will cancel the upload."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL cannot be empty."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Error"
 
@@ -132,7 +132,7 @@ msgstr "Share"
 msgid "Delete permanently"
 msgstr "Delete permanently"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Rename"
 
@@ -164,13 +164,13 @@ msgstr "replaced {new_name} with {old_name}"
 msgid "undo"
 msgstr "undo"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n folder"
 msgstr[1] "%n folders"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n file"
@@ -212,14 +212,14 @@ msgstr "Your storage is almost full ({usedSpacePercent}%)"
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
-msgstr ""
+msgstr "Encryption App is enabled but your keys are not initialised, please log-out and log-in again"
 
 #: js/files.js:72
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
-msgstr ""
+msgstr "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files."
 
 #: js/files.js:76
 msgid ""
@@ -227,25 +227,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Your download is being prepared. This might take some time if the files are big."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "Error moving file"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Size"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Modified"
 
@@ -254,7 +254,7 @@ msgstr "Modified"
 msgid "%s could not be renamed"
 msgstr "%s could not be renamed"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Upload"
 
@@ -290,65 +290,65 @@ msgstr "Maximum input size for ZIP files"
 msgid "Save"
 msgstr "Save"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "New"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Text file"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Folder"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "From link"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Deleted files"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Cancel upload"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "You don’t have write permission here."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Nothing in here. Upload something!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Unshare"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Delete"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Upload too large"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "The files you are trying to upload exceed the maximum size for file uploads on this server."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Files are being scanned, please wait."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Current scanning"
 
diff --git a/l10n/en_GB/files_encryption.po b/l10n/en_GB/files_encryption.po
index 1354eff62b27e50a26014caf2311227fd3e82306..4a20a39c4559b39b0e708e5a52d4f36640ca5689 100644
--- a/l10n/en_GB/files_encryption.po
+++ b/l10n/en_GB/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -54,14 +54,14 @@ msgid ""
 "correct."
 msgstr "Could not update the private key password. Maybe the old password was not correct."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
-msgstr ""
+msgstr "Encryption app not initialised! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialise the encryption app."
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -69,6 +69,18 @@ msgid ""
 "files."
 msgstr "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files."
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "Missing requirements."
@@ -80,7 +92,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled."
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "Following users are not set up for encryption:"
 
@@ -90,97 +102,97 @@ msgstr "Saving..."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
-msgstr ""
+msgstr "Go directly to your "
 
 #: templates/invalid_private_key.php:8
 msgid "personal settings"
 msgstr "personal settings"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Encryption"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Enable recovery key (allow to recover users files in case of password loss):"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "Recovery key password"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
-msgstr ""
+msgstr "Repeat recovery key password"
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Enabled"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Disabled"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "Change recovery key password:"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
-msgstr "Old Recovery key password"
+msgstr "Old recovery key password"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
-msgstr "New Recovery key password"
+msgstr "New recovery key password"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
-msgstr ""
+msgstr "Repeat new recovery key password"
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Change Password"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
-msgstr "Your private key password no longer match your login password:"
+msgstr "Your private key password no longer matches your login password:"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "Set your old private key password to your current login password."
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr " If you don't remember your old password you can ask your administrator to recover your files."
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Old login password"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Current login password"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "Update Private Key Password"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Enable password recovery:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss"
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "File recovery settings updated"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "Could not update file recovery"
diff --git a/l10n/en_GB/files_sharing.po b/l10n/en_GB/files_sharing.po
index a0f4b32037f646e1965bcd31f6f3d47393ed5b6d..2f9fc3ffbac2cc98750d8948f37a11e5dca37665 100644
--- a/l10n/en_GB/files_sharing.po
+++ b/l10n/en_GB/files_sharing.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-09-20 10:44-0400\n"
-"PO-Revision-Date: 2013-09-18 16:46+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "The password is wrong. Try again."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Password"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Submit"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Sorry, this link doesn’t seem to work anymore."
@@ -54,28 +54,28 @@ msgstr "sharing is disabled"
 msgid "For more info, please ask the person who sent this link."
 msgstr "For more info, please ask the person who sent this link."
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s shared the folder %s with you"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s shared the file %s with you"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Download"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Upload"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Cancel upload"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "No preview available for"
diff --git a/l10n/en_GB/files_trashbin.po b/l10n/en_GB/files_trashbin.po
index d32064c181322f1c542fef966d3a4a355190dcdf..ce11b681d4363a044d100b27a8b8dd9a17e647a6 100644
--- a/l10n/en_GB/files_trashbin.po
+++ b/l10n/en_GB/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,42 +28,10 @@ msgstr "Couldn't delete %s permanently"
 msgid "Couldn't restore %s"
 msgstr "Couldn't restore %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "perform restore operation"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Error"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "delete file permanently"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Delete permanently"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Name"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Deleted"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n folder"
-msgstr[1] "%n folders"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n file"
-msgstr[1] "%n files"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "restored"
@@ -72,11 +40,19 @@ msgstr "restored"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Nothing in here. Your recycle bin is empty!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Name"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Restore"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Deleted"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Delete"
 
diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po
index 2afc895a38d7b379d32fe3d021b96791a30e833c..34fd3ee9bd3e5c9c08cbcd48c378422542b06e33 100644
--- a/l10n/en_GB/settings.po
+++ b/l10n/en_GB/settings.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-09 13:20+0000\n"
+"Last-Translator: mnestis <transifex@mnestis.net>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -182,32 +182,32 @@ msgstr "undo"
 msgid "Unable to remove user"
 msgstr "Unable to remove user"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: js/users.js:95 templates/users.php:26 templates/users.php:90
 #: templates/users.php:118
 msgid "Groups"
 msgstr "Groups"
 
-#: js/users.js:97 templates/users.php:92 templates/users.php:130
+#: js/users.js:100 templates/users.php:92 templates/users.php:130
 msgid "Group Admin"
 msgstr "Group Admin"
 
-#: js/users.js:120 templates/users.php:170
+#: js/users.js:123 templates/users.php:170
 msgid "Delete"
 msgstr "Delete"
 
-#: js/users.js:277
+#: js/users.js:280
 msgid "add group"
 msgstr "add group"
 
-#: js/users.js:436
+#: js/users.js:442
 msgid "A valid username must be provided"
 msgstr "A valid username must be provided"
 
-#: js/users.js:437 js/users.js:443 js/users.js:458
+#: js/users.js:443 js/users.js:449 js/users.js:464
 msgid "Error creating user"
 msgstr "Error creating user"
 
-#: js/users.js:442
+#: js/users.js:448
 msgid "A valid password must be provided"
 msgstr "A valid password must be provided"
 
@@ -343,11 +343,11 @@ msgstr "Allow users to only share with users in their groups"
 
 #: templates/admin.php:170
 msgid "Allow mail notification"
-msgstr ""
+msgstr "Allow mail notification"
 
 #: templates/admin.php:171
 msgid "Allow user to send mail notification for shared files"
-msgstr ""
+msgstr "Allow user to send mail notification for shared files"
 
 #: templates/admin.php:178
 msgid "Security"
diff --git a/l10n/en_GB/user_ldap.po b/l10n/en_GB/user_ldap.po
index d525130a2e6adc01ace4ea49e1e9a5e7acb103fc..7fe9b8147f1b6862eb89e83ec794dd606ad8a388 100644
--- a/l10n/en_GB/user_ldap.po
+++ b/l10n/en_GB/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -369,14 +369,18 @@ msgid ""
 msgstr "By default, the UUID attribute is automatically detected. The UUID attribute is used to unambiguously identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups."
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "UUID Attribute:"
+msgid "UUID Attribute for Users:"
+msgstr ""
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "Username-LDAP User Mapping"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -390,18 +394,18 @@ msgid ""
 "experimental stage."
 msgstr "Usernames are used to store and assign (meta) data. In order to precisely identify and recognise users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage."
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Clear Username-LDAP User Mapping"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Clear Groupname-LDAP Group Mapping"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Test Configuration"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Help"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 1409bb9dc0043a2f6c6e2e0caa40252e8babb9d9..04621772e2ddf1d304250355b0e52cf99f984028 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -58,45 +58,6 @@ msgstr ""
 msgid "... %d%% done ..."
 msgstr ""
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Ne proviziĝis tipon de kategorio."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Ĉu neniu kategorio estas aldonota?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Tiu kategorio jam ekzistas: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Ne proviziĝis tipon de objekto."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "Ne proviziĝis ID-on de %s."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Eraro dum aldono de %s al favoratoj."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Neniu kategorio elektiĝis por forigo."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Eraro dum forigo de %s el favoratoj."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -313,27 +274,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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 "Ne indikiĝis tipo de la objekto."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Eraro"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Ne indikiĝis nomo de la aplikaĵo."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "La necesa dosiero {file} ne instaliĝis!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Dividita"
@@ -342,7 +282,12 @@ msgstr "Dividita"
 msgid "Share"
 msgstr "Kunhavigi"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Eraro"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Eraro dum kunhavigo"
 
@@ -374,7 +319,7 @@ msgstr "Kunhavigi per ligilo"
 msgid "Password protect"
 msgstr "Protekti per pasvorto"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Pasvorto"
 
@@ -446,30 +391,58 @@ msgstr "forigi"
 msgid "share"
 msgstr "kunhavigi"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Protektita per pasvorto"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Eraro dum malagordado de limdato"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Eraro dum agordado de limdato"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Sendante..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "La retpoŝtaĵo sendiĝis"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Averto"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Ne indikiĝis tipo de la objekto."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Forigi"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Aldoni"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -506,7 +479,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Uzantonomo"
 
@@ -550,7 +523,7 @@ msgstr "Persona"
 msgid "Users"
 msgstr "Uzantoj"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Aplikaĵoj"
 
@@ -562,6 +535,34 @@ msgstr "Administranto"
 msgid "Help"
 msgstr "Helpo"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Aliro estas malpermesata"
@@ -591,14 +592,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Redakti kategoriojn"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Aldoni"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -688,12 +681,12 @@ msgstr "Fini la instalon"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s haveblas. Ekhavi pli da informo pri kiel ĝisdatigi."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Elsaluti"
 
@@ -711,19 +704,27 @@ msgstr "Se vi ne ŝanĝis vian pasvorton lastatempe, via konto eble kompromitas!
 msgid "Please change your password to secure your account again."
 msgstr "Bonvolu ŝanĝi vian pasvorton por sekurigi vian konton ree."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Ĉu vi perdis vian pasvorton?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "memori"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Ensaluti"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Alternativaj ensalutoj"
 
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index e87b33f99bfa28020f1c0d949d27e6a7930789a8..8f735ceb3358d5879d42a2dde54a1c6ac99636de 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -75,15 +75,15 @@ msgstr "Malsukcesis skribo al disko"
 msgid "Not enough storage available"
 msgstr "Ne haveblas sufiĉa memoro"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Nevalida dosierujo."
 
@@ -91,36 +91,36 @@ msgstr "Nevalida dosierujo."
 msgid "Files"
 msgstr "Dosieroj"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Ne haveblas sufiĉa spaco"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "La alŝuto nuliĝis."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL ne povas esti malplena."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Nevalida dosierujnomo. La uzo de “Shared” estas rezervita de ownCloud."
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Eraro"
 
@@ -132,7 +132,7 @@ msgstr "Kunhavigi"
 msgid "Delete permanently"
 msgstr "Forigi por ĉiam"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Alinomigi"
 
@@ -164,13 +164,13 @@ msgstr "anstataŭiĝis {new_name} per {old_name}"
 msgid "undo"
 msgstr "malfari"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -227,25 +227,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Via elŝuto pretiĝatas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Nomo"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Grando"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Modifita"
 
@@ -254,7 +254,7 @@ msgstr "Modifita"
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Alŝuti"
 
@@ -290,65 +290,65 @@ msgstr "Maksimuma enirgrando por ZIP-dosieroj"
 msgid "Save"
 msgstr "Konservi"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nova"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Tekstodosiero"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Dosierujo"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "El ligilo"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Forigitaj dosieroj"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Nuligi alŝuton"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Vi ne havas permeson skribi ĉi tie."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Nenio estas ĉi tie. Alŝutu ion!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Elŝuti"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Malkunhavigi"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Forigi"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Alŝuto tro larĝa"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Dosieroj estas skanataj, bonvolu atendi."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Nuna skano"
 
diff --git a/l10n/eo/files_encryption.po b/l10n/eo/files_encryption.po
index e607bf91723d524109969b71d7dc171067cadc85..6f54311ea055781b0abadbabfd5adee1f4b9508a 100644
--- a/l10n/eo/files_encryption.po
+++ b/l10n/eo/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -54,14 +54,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -69,6 +69,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -80,7 +92,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -96,91 +108,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "persona agordo"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Ĉifrado"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Kapabligita"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Malkapabligita"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Ŝarĝi pasvorton"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "La pasvorto de via malpublika klavo ne plu kongruas kun via ensaluta pasvorto:"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Malnova ensaluta pasvorto"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Nuna ensaluta pasvorto"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "Ĝisdatigi la pasvorton de la malpublika klavo"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index cc9cb10772a832d3345f784047e1be90fb5aa07e..3a9a67cd812178650fc35dff0f695fbbf9eba6c1 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Pasvorto"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Sendi"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s kunhavigis la dosierujon %s kun vi"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s kunhavigis la dosieron %s kun vi"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Elŝuti"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Alŝuti"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Nuligi alŝuton"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Ne haveblas antaŭvido por"
diff --git a/l10n/eo/files_trashbin.po b/l10n/eo/files_trashbin.po
index cb45265ca89b250c0fde4dde98df23e9ccd72949..5d90fbd525c08c111d195bd8514427a5c3a7bcc3 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -27,42 +27,10 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Eraro"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Forigi por ĉiam"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Nomo"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -71,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Nomo"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Restaŭri"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Forigi"
 
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 84547fe20e885b2df44ec9d8996494528ab25406..33dc3c7692676eaf151070758be11c4df1154d2a 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -369,14 +369,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -390,18 +394,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Provi agordon"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Helpo"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index c3e95144caab0bc8ecdac14b9a5f3e9a63a6e403..a3b45fbe5c489d70606466706a4338b9ae9a5f08 100644
--- a/l10n/es/core.po
+++ b/l10n/es/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -35,7 +35,7 @@ msgstr "%s ha compatido  »%s« contigo"
 #: ajax/share.php:168
 #, php-format
 msgid "Couldn't send mail to following users: %s "
-msgstr ""
+msgstr "No se pudo enviar mensajes a los siguientes usuarios: %s"
 
 #: ajax/share.php:327
 msgid "group"
@@ -66,45 +66,6 @@ msgstr "Caché de archivos actualizada"
 msgid "... %d%% done ..."
 msgstr "... %d%% hecho ..."
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Tipo de categoría no proporcionado."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "¿Ninguna categoría para añadir?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Esta categoría ya existe: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Tipo de objeto no proporcionado."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "ID de %s no proporcionado."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Error añadiendo %s a favoritos."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "No hay categorías seleccionadas para borrar."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Error eliminando %s de los favoritos."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "No se especificó ningún archivo o imagen"
@@ -321,27 +282,6 @@ msgstr "({count} seleccionados)"
 msgid "Error loading file exists template"
 msgstr "Error cargando plantilla de archivo existente"
 
-#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
-#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
-msgid "The object type is not specified."
-msgstr "El tipo de objeto no está especificado."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Error"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "El nombre de la aplicación no está especificado."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "¡El fichero {file} es necesario y no está instalado!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Compartido"
@@ -350,7 +290,12 @@ msgstr "Compartido"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Error"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Error al compartir"
 
@@ -382,7 +327,7 @@ msgstr "Compartir con enlace"
 msgid "Password protect"
 msgstr "Protección con contraseña"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Contraseña"
 
@@ -428,7 +373,7 @@ msgstr "Dejar de compartir"
 
 #: js/share.js:353
 msgid "notify user by email"
-msgstr ""
+msgstr "notificar al usuario por correo electrónico"
 
 #: js/share.js:361
 msgid "can edit"
@@ -454,30 +399,58 @@ msgstr "eliminar"
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Protegido con contraseña"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Error eliminando fecha de caducidad"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Error estableciendo fecha de caducidad"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Correo electrónico enviado"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Precaución"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "El tipo de objeto no está especificado."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Eliminar"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Agregar"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -514,7 +487,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Recibirá un enlace por correo electrónico para restablecer su contraseña"
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Nombre de usuario"
 
@@ -558,7 +531,7 @@ msgstr "Personal"
 msgid "Users"
 msgstr "Usuarios"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Aplicaciones"
 
@@ -570,6 +543,34 @@ msgstr "Administración"
 msgid "Help"
 msgstr "Ayuda"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Acceso denegado"
@@ -586,26 +587,18 @@ msgid ""
 "just letting you know that %s shared %s with you.\n"
 "View it: %s\n"
 "\n"
-msgstr ""
+msgstr "Hola:\n\nTan solo queremos informarte que %s compartió %s contigo.\nMíralo aquí: %s\n\n"
 
 #: templates/altmail.php:4
 #, php-format
 msgid ""
 "The share will expire on %s.\n"
 "\n"
-msgstr ""
+msgstr "El objeto dejará de ser compartido el %s.\n\n"
 
 #: templates/altmail.php:6 templates/mail.php:19
 msgid "Cheers!"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Editar categorías"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Agregar"
+msgstr "¡Saludos!"
 
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
@@ -694,14 +687,14 @@ msgstr "Completar la instalación"
 
 #: templates/installation.php:184
 msgid "Finishing …"
-msgstr ""
+msgstr "Finalizando..."
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s esta disponible. Obtener mas información de como actualizar."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Salir"
 
@@ -719,19 +712,27 @@ msgstr "Si no ha cambiado su contraseña recientemente, ¡puede que su cuenta es
 msgid "Please change your password to secure your account again."
 msgstr "Por favor cambie su contraseña para asegurar su cuenta nuevamente."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr "La autenticación a fallado en el servidor."
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr "Sírvase contactar a su administrador."
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "¿Ha perdido su contraseña?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "recordar"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Entrar"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Inicios de sesión alternativos"
 
@@ -740,12 +741,12 @@ msgstr "Inicios de sesión alternativos"
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>"
-msgstr ""
+msgstr "Hola:<br><br>tan solo queremos informarte que %s compartió «%s» contigo.<br><a href=\"%s\">¡Míralo acá!</a><br><br>"
 
 #: templates/mail.php:17
 #, php-format
 msgid "The share will expire on %s.<br><br>"
-msgstr ""
+msgstr "El objeto dejará de ser compartido el %s.<br><br>"
 
 #: templates/update.php:3
 #, php-format
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 14e84c937378c1505cb6965329d6ff6c0f17542e..59ceddc2aaafeb0acf01b459b32f64647e22807d 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -5,6 +5,7 @@
 # Translators:
 # Art O. Pal <artopal@fastmail.fm>, 2013
 # ggam <ggam@brainleakage.com>, 2013
+# japaol <japaol@gmail.com>, 2013
 # mikelanabitarte <mikelanabitarte@gmail.com>, 2013
 # qdneren <renanqd@yahoo.com.mx>, 2013
 # Korrosivo <yo@rubendelcampo.es>, 2013
@@ -13,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+0000\n"
+"Last-Translator: japaol <japaol@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"
@@ -80,15 +81,15 @@ msgstr "Falló al escribir al disco"
 msgid "Not enough storage available"
 msgstr "No hay suficiente espacio disponible"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr "Actualización fallida. No se pudo obtener información del archivo."
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Actualización fallida. No se pudo encontrar el archivo subido"
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Directorio inválido."
 
@@ -96,36 +97,36 @@ msgstr "Directorio inválido."
 msgid "Files"
 msgstr "Archivos"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes"
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "No hay suficiente espacio disponible"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr "No se pudo obtener respuesta del servidor."
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "La subida del archivo está en proceso. Si sale de la página ahora cancelará la subida."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "La URL no puede estar vacía."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Nombre de carpeta invalido. El uso de \"Shared\" está reservado por ownCloud"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Error"
 
@@ -137,7 +138,7 @@ msgstr "Compartir"
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Renombrar"
 
@@ -169,13 +170,13 @@ msgstr "reemplazado {new_name} con {old_name}"
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] "%n carpetas"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -217,14 +218,14 @@ msgstr "Su almacenamiento está casi lleno ({usedSpacePercent}%)"
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
-msgstr ""
+msgstr "Encryption App está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo."
 
 #: js/files.js:72
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
-msgstr ""
+msgstr "La clave privada no es válida para Encryption App. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos encriptados."
 
 #: js/files.js:76
 msgid ""
@@ -232,25 +233,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Su descarga está siendo preparada. Esto puede tardar algún tiempo si los archivos son grandes."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "Error moviendo archivo"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Modificado"
 
@@ -259,7 +260,7 @@ msgstr "Modificado"
 msgid "%s could not be renamed"
 msgstr "%s no se pudo renombrar"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Subir"
 
@@ -295,65 +296,65 @@ msgstr "Tamaño máximo para archivos ZIP de entrada"
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nuevo"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Archivo de texto"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Carpeta"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Desde enlace"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Archivos eliminados"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "No tiene permisos de escritura aquí."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "No hay nada aquí. ¡Suba algo!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Subida demasido grande"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Los archivos están siendo escaneados,  por favor espere."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Escaneo actual"
 
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index d13d422ffd57a243d0ab6703f7ae628a9140dce4..3e66b297ce55fb689c432bcd10c88becc03c57da 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -3,8 +3,10 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Art O. Pal <artopal@fastmail.fm>, 2013
 # asaez <asaez@asaez.eu>, 2013
 # gmoriello <gmoriello@gmail.com>, 2013
+# japaol <japaol@gmail.com>, 2013
 # mikelanabitarte <mikelanabitarte@gmail.com>, 2013
 # Korrosivo <yo@rubendelcampo.es>, 2013
 # saskarip <saskarip@gmail.com>, 2013
@@ -14,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -60,14 +62,14 @@ msgid ""
 "correct."
 msgstr "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
-msgstr ""
+msgstr "¡Encryption App no está inicializada!. Quizás la aplicación fue reiniciada durante tu sesión. Por favor, cierra la sesión y vuelva a iniciarla para intentar inicializar la Encryption App."
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -75,6 +77,18 @@ msgid ""
 "files."
 msgstr "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. Puede actualizar su clave privada en sus opciones personales para recuperar el acceso a sus ficheros."
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "Requisitos incompletos."
@@ -86,7 +100,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada."
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "Los siguientes usuarios no han sido configurados para el cifrado:"
 
@@ -96,97 +110,97 @@ msgstr "Guardando..."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
-msgstr ""
+msgstr "Ir directamente a su"
 
 #: templates/invalid_private_key.php:8
 msgid "personal settings"
 msgstr "opciones personales"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Habilitar la clave de recuperación (permite recuperar los ficheros del usuario en caso de pérdida de la contraseña);"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "Contraseña de clave de recuperación"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
-msgstr ""
+msgstr "Repetir contraseña de clave de recuperación"
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Habilitar"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Deshabilitado"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "Cambiar la contraseña de la clave de recuperación"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "Antigua clave de recuperación"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "Nueva clave de recuperación"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
-msgstr ""
+msgstr "Repetir nueva contraseña de clave de recuperación"
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Su contraseña de clave privada ya no coincide con su contraseña de acceso:"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "Establecer la contraseña de su antigua clave privada a su contraseña actual de acceso."
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus ficheros."
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Contraseña de acceso antigua"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Contraseña de acceso actual"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "Actualizar Contraseña de Clave Privada"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Habilitar la recuperación de contraseña:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Habilitar esta opción le permitirá volver a tener acceso a sus ficheros cifrados en caso de pérdida de contraseña"
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "Opciones de recuperación de archivos actualizada"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "No se pudo actualizar la recuperación de archivos"
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index 26442ede404f6f510c24a04d2ce0a722917e6b31..d027ef55b7af0cb42fefcd2fa269aee9542e33c1 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-13 23:50+0000\n"
-"Last-Translator: Korrosivo <yo@rubendelcampo.es>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -20,17 +20,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "La contraseña introducida es errónea. Inténtelo de nuevo."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Enviar"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Vaya, este enlace parece que no volverá a funcionar."
@@ -55,28 +55,28 @@ msgstr "compartir está desactivado"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Para mayor información, contacte a la persona que le envió el enlace."
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s compartió la carpeta %s contigo"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s compartió el fichero %s contigo"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Subir"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "No hay vista previa disponible para"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index 375095a68b2182c5a07344f610e4286c20a6b6b9..b9a630d04acbeaf601024eefdc2fea4bb9501432 100644
--- a/l10n/es/files_trashbin.po
+++ b/l10n/es/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: Korrosivo <yo@rubendelcampo.es>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -29,42 +29,10 @@ msgstr "No se puede eliminar %s permanentemente"
 msgid "Couldn't restore %s"
 msgstr "No se puede restaurar %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "restaurar"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Error"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "eliminar archivo permanentemente"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Eliminar permanentemente"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Nombre"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Eliminado"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n carpeta"
-msgstr[1] "%n carpetas"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n archivo"
-msgstr[1] "%n archivos"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "recuperado"
@@ -73,11 +41,19 @@ msgstr "recuperado"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "No hay nada aquí. ¡Tu papelera esta vacía!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Nombre"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Recuperar"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Eliminado"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Eliminar"
 
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index a6d1816d4c66553f540ffee70b8942a780a62515..5998f85831baafbfa2c1649593b7d486c7167164 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -7,6 +7,7 @@
 # asaez <asaez@asaez.eu>, 2013
 # eadeprado <eadeprado@outlook.com>, 2013
 # ggam <ggam@brainleakage.com>, 2013
+# japaol <japaol@gmail.com>, 2013
 # pablomillaquen <pablomillaquen@gmail.com>, 2013
 # qdneren <renanqd@yahoo.com.mx>, 2013
 # Korrosivo <yo@rubendelcampo.es>, 2013
@@ -16,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-08 22:40+0000\n"
+"Last-Translator: japaol <japaol@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"
@@ -190,32 +191,32 @@ msgstr "deshacer"
 msgid "Unable to remove user"
 msgstr "No se puede eliminar el usuario"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: js/users.js:95 templates/users.php:26 templates/users.php:90
 #: templates/users.php:118
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:97 templates/users.php:92 templates/users.php:130
+#: js/users.js:100 templates/users.php:92 templates/users.php:130
 msgid "Group Admin"
 msgstr "Administrador del Grupo"
 
-#: js/users.js:120 templates/users.php:170
+#: js/users.js:123 templates/users.php:170
 msgid "Delete"
 msgstr "Eliminar"
 
-#: js/users.js:277
+#: js/users.js:280
 msgid "add group"
 msgstr "añadir Grupo"
 
-#: js/users.js:436
+#: js/users.js:442
 msgid "A valid username must be provided"
 msgstr "Se debe proporcionar un nombre de usuario  válido"
 
-#: js/users.js:437 js/users.js:443 js/users.js:458
+#: js/users.js:443 js/users.js:449 js/users.js:464
 msgid "Error creating user"
 msgstr "Error al crear usuario"
 
-#: js/users.js:442
+#: js/users.js:448
 msgid "A valid password must be provided"
 msgstr "Se debe proporcionar una contraseña valida"
 
@@ -351,11 +352,11 @@ msgstr "Permitir a los usuarios compartir sólo con los usuarios en sus grupos"
 
 #: templates/admin.php:170
 msgid "Allow mail notification"
-msgstr ""
+msgstr "Permitir notificaciones por email"
 
 #: templates/admin.php:171
 msgid "Allow user to send mail notification for shared files"
-msgstr ""
+msgstr "Permitir al usuario enviar notificaciones por email de archivos compartidos"
 
 #: templates/admin.php:178
 msgid "Security"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 9b772412cea7590bb423dc8c14dfcf7c9ee83023..1a76432405ab8441b053d4c67c7c34f18247a9eb 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: Korrosivo <yo@rubendelcampo.es>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -373,14 +373,18 @@ msgid ""
 msgstr "Por defecto, el atributo UUID es autodetectado. Este atributo es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los usuarios y grupos de LDAP mapeados (añadidos) recientemente."
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "Atributo UUID:"
+msgid "UUID Attribute for Users:"
+msgstr ""
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "Asignación del Nombre de usuario de un usuario LDAP"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -394,18 +398,18 @@ msgid ""
 "experimental stage."
 msgstr "Los usuarios son usados para almacenar y asignar (meta) datos. Con el fin de identificar de forma precisa y reconocer usuarios, cada usuario de LDAP tendrá un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es cacheado para reducir la interacción entre el LDAP, pero no es usado para identificar. Si el DN cambia, los cambios serán aplicados. El nombre de usuario interno es usado por encima de todo. Limpiar los mapeos dejará restos por todas partes, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, únicamente en una fase de desarrollo o experimental."
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Borrar la asignación de los Nombres de usuario de los usuarios LDAP"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Configuración de prueba"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Ayuda"
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index c86e96b34c8b77eb74745211a953aead366d4db9..d719bb0a047cff6d2841801994723a48d88e1818 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -57,45 +57,6 @@ msgstr "Caché de archivos actualizada"
 msgid "... %d%% done ..."
 msgstr "... %d%% hecho ..."
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Tipo de categoría no provisto. "
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "¿Ninguna categoría para añadir?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Esta categoría ya existe: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Tipo de objeto no provisto. "
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID no provista. "
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Error al agregar %s a favoritos. "
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "No se seleccionaron categorías para borrar."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Error al borrar %s de favoritos. "
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -312,27 +273,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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 "El tipo de objeto no está especificado. "
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Error"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "El nombre de la App no está especificado."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "¡El archivo requerido {file} no está instalado!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Compartido"
@@ -341,7 +281,12 @@ msgstr "Compartido"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Error"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Error al compartir"
 
@@ -373,7 +318,7 @@ msgstr "Compartir con enlace"
 msgid "Password protect"
 msgstr "Proteger con contraseña "
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Contraseña"
 
@@ -445,30 +390,58 @@ msgstr "borrar"
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Protegido por contraseña"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Error al remover la fecha de vencimiento"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Error al asignar fecha de vencimiento"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Mandando..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "e-mail mandado"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Atención"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "El tipo de objeto no está especificado. "
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Borrar"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Agregar"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -505,7 +478,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Vas a recibir un enlace por e-mail para restablecer tu contraseña."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Nombre de usuario"
 
@@ -549,7 +522,7 @@ msgstr "Personal"
 msgid "Users"
 msgstr "Usuarios"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Apps"
 
@@ -561,6 +534,34 @@ msgstr "Administración"
 msgid "Help"
 msgstr "Ayuda"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Acceso prohibido"
@@ -590,14 +591,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Editar categorías"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Agregar"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -687,12 +680,12 @@ msgstr "Completar la instalación"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s está disponible. Obtené más información sobre cómo actualizar."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Cerrar la sesión"
 
@@ -710,19 +703,27 @@ msgstr "¡Si no cambiaste tu contraseña recientemente, puede ser que tu cuenta
 msgid "Please change your password to secure your account again."
 msgstr "Por favor, cambiá tu contraseña para incrementar la seguridad de tu cuenta."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "¿Perdiste tu contraseña?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "recordame"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Iniciar sesión"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Nombre alternativos de usuarios"
 
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index 622c0d6766b5f5c445b7f78a791b31a5d3f49f28..22b748853567acc038b99512835e1c6a9e628ab3 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -78,15 +78,15 @@ msgstr "Error al escribir en el disco"
 msgid "Not enough storage available"
 msgstr "No hay suficiente almacenamiento"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Directorio inválido."
 
@@ -94,36 +94,36 @@ msgstr "Directorio inválido."
 msgid "Files"
 msgstr "Archivos"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "No hay suficiente espacio disponible"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "La subida fue cancelada"
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "La URL no puede estar vacía"
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Nombre de directorio inválido. El uso de \"Shared\" está reservado por ownCloud"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Error"
 
@@ -135,7 +135,7 @@ msgstr "Compartir"
 msgid "Delete permanently"
 msgstr "Borrar permanentemente"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Cambiar nombre"
 
@@ -167,13 +167,13 @@ msgstr "se reemplazó {new_name} con {old_name}"
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n carpeta"
 msgstr[1] "%n carpetas"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n archivo"
@@ -230,25 +230,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "El proceso de cifrado se ha desactivado, pero los archivos aún están encriptados. Por favor, vaya a la configuración personal para descifrar los archivos."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Tu descarga se está preparando. Esto puede demorar si los archivos son muy grandes."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Modificado"
 
@@ -257,7 +257,7 @@ msgstr "Modificado"
 msgid "%s could not be renamed"
 msgstr "No se pudo renombrar %s"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Subir"
 
@@ -293,65 +293,65 @@ msgstr "Tamaño máximo para archivos ZIP de entrada"
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nuevo"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Archivo de texto"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Carpeta"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Desde enlace"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Archivos borrados"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "No tenés permisos de escritura acá."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "No hay nada. ¡Subí contenido!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Borrar"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "El tamaño del archivo que querés subir es demasiado grande"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Los archivos que intentás subir sobrepasan el tamaño máximo "
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Se están escaneando los archivos, por favor esperá."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Escaneo actual"
 
diff --git a/l10n/es_AR/files_encryption.po b/l10n/es_AR/files_encryption.po
index 7084c3602f4d9568569d93e88d9eac837b328a9d..0056c8476c58024590b40995c423a3dafcae17bd 100644
--- a/l10n/es_AR/files_encryption.po
+++ b/l10n/es_AR/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -55,14 +55,14 @@ msgid ""
 "correct."
 msgstr "No fue posible actualizar la contraseña de clave privada. Tal vez la contraseña anterior no es correcta."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -70,6 +70,18 @@ msgid ""
 "files."
 msgstr "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada desde fuera del sistema de ownCloud (por ej. desde tu cuenta de sistema). Podés actualizar tu clave privada en la sección de \"configuración personal\", para recuperar el acceso a tus archivos."
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "Requisitos incompletos."
@@ -81,7 +93,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Por favor, asegúrese de que PHP 5.3.3 o una versión más reciente esté instalado y que OpenSSL junto con la extensión PHP esté habilitado y configurado apropiadamente. Por ahora, la aplicación de encriptación ha sido deshabilitada."
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "Los siguientes usuarios no fueron configurados para encriptar:"
 
@@ -97,91 +109,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "Configuración personal"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Encriptación"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Habilitar clave de recuperación (te permite recuperar los archivos de usuario en el caso que pierdas la contraseña):"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "Contraseña de recuperación de clave"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Deshabilitado"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "Cambiar contraseña para recuperar la clave:"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "Contraseña antigua de recuperación de clave"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "Nueva contraseña de recuperación de clave"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Tu contraseña de clave privada ya no coincide con la contraseña de ingreso:"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "Usá tu contraseña de clave privada antigua para tu contraseña de ingreso actual."
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Si no te acordás de tu contraseña antigua, pedile al administrador que recupere tus archivos"
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Contraseña anterior"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Contraseña actual"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "Actualizar contraseña de la clave privada"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Habilitar recuperación de contraseña:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Habilitando esta opción, vas a tener acceso a tus archivos encriptados, incluso si perdés la contraseña"
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "Las opciones de recuperación de archivos fueron actualizadas"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "No fue posible actualizar la recuperación de archivos"
diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po
index cea65819e726030c263f40f880c9271f24f00d16..c1307a7e9e6a1fc2dfdeb4ab2ea574de31574796 100644
--- a/l10n/es_AR/files_sharing.po
+++ b/l10n/es_AR/files_sharing.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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "La contraseña no es correcta. Probá de nuevo."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Enviar"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Perdón, este enlace parece no funcionar más."
@@ -54,28 +54,28 @@ msgstr "compartir está desactivado"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Para mayor información, contactá a la persona que te mandó el enlace."
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s compartió la carpeta %s con vos"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s compartió el archivo %s con vos"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Subir"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "La vista preliminar no está disponible para"
diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po
index abcc1f3e13784d0531ab768d34935bc873d63554..d9a1857ffa9efc4bc0e10f28c8a646e07f8417ec 100644
--- a/l10n/es_AR/files_trashbin.po
+++ b/l10n/es_AR/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -28,42 +28,10 @@ msgstr "No fue posible borrar %s de manera permanente"
 msgid "Couldn't restore %s"
 msgstr "No se pudo restaurar %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "Restaurar"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Error"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "Borrar archivo de manera permanente"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Borrar de manera permanente"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Nombre"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Borrado"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n directorio"
-msgstr[1] "%n directorios"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n archivo"
-msgstr[1] "%n archivos"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "recuperado"
@@ -72,11 +40,19 @@ msgstr "recuperado"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "No hay nada acá. ¡La papelera está vacía!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Nombre"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Recuperar"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Borrado"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Borrar"
 
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index e6e91d2f16d66c6df3e502785ffcc1fec3c6265a..2bc3684a80234b150985a6c71996a0e0ba86f013 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -369,14 +369,18 @@ msgid ""
 msgstr "Por defecto, el atributo UUID es detectado automáticamente. Este atributo es usado para identificar de manera certera usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no fue especificado otro comportamiento más arriba. Podés sobrescribir la configuración y pasar un atributo de tu elección. Tenés que asegurarte que el atributo de tu elección sea accesible por los usuarios y grupos y que sea único. Dejalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto sólo en los nuevos usuarios y grupos de LDAP mapeados (agregados)."
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "Atributo UUID:"
+msgid "UUID Attribute for Users:"
+msgstr ""
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "Asignación del Nombre de usuario de un usuario LDAP"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -390,18 +394,18 @@ msgid ""
 "experimental stage."
 msgstr "Los usuarios son usados para almacenar y asignar datos (metadatos). Con el fin de identificar de forma precisa y reconocer usuarios, a cada usuario de LDAP se será asignado un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es dejado en caché para reducir la interacción entre el LDAP, pero no es usado para la identificación. Si el DN cambia, los cambios van a ser aplicados. El nombre de usuario interno es usado en todos los lugares. Vaciar los mapeos, deja restos por todas partes. Vaciar los mapeos, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, solamente en fase de desarrollo o experimental."
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Borrar la asignación de los Nombres de usuario de los usuarios LDAP"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Probar configuración"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Ayuda"
diff --git a/l10n/es_MX/core.po b/l10n/es_MX/core.po
index 521c62be0cd2033e7476d1d41b0ab94f47a56142..a4d84218fd79d64522778bd1e8538cd87be6dbac 100644
--- a/l10n/es_MX/core.po
+++ b/l10n/es_MX/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -311,27 +272,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -340,7 +280,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr ""
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -372,7 +317,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr ""
 
@@ -444,30 +389,58 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -504,7 +477,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr ""
 
@@ -548,7 +521,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr ""
 
@@ -560,6 +533,34 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -589,14 +590,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr ""
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -686,12 +679,12 @@ msgstr ""
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr ""
 
@@ -709,19 +702,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/es_MX/files_encryption.po b/l10n/es_MX/files_encryption.po
index 27fa48061c02d0d55de6457220eb4f2a20a56e68..0a11199d9d48835b4a6bd55a0256f4e36c823505 100644
--- a/l10n/es_MX/files_encryption.po
+++ b/l10n/es_MX/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/es_MX/files_sharing.po b/l10n/es_MX/files_sharing.po
index 3cce6ac339f6dccbec4367a40743b3a00e25d3c6..0accae637bfcb76a9e0e37aed835c468c8f4d932 100644
--- a/l10n/es_MX/files_sharing.po
+++ b/l10n/es_MX/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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
-msgid "Password"
+msgid "The password is wrong. Try again."
 msgstr ""
 
-#: templates/authenticate.php:9
-msgid "Submit"
+#: templates/authenticate.php:10
+msgid "Password"
 msgstr ""
 
 #: templates/part.404.php:3
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/es_MX/files_trashbin.po b/l10n/es_MX/files_trashbin.po
index 42fb8a7b1f2564304bbedfff5281774910f52cb9..c9ff11a354b09609a90e0c0f93e6ff5a93033e08 100644
--- a/l10n/es_MX/files_trashbin.po
+++ b/l10n/es_MX/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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
@@ -27,55 +27,31 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:37
-msgid "delete file permanently"
+#: lib/trashbin.php:814 lib/trashbin.php:816
+msgid "restored"
 msgstr ""
 
-#: js/trash.js:129
-msgid "Delete permanently"
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: js/trash.js:184 templates/index.php:17
+#: templates/index.php:23
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:185 templates/index.php:27
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:193
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:199
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/trash.php:814 lib/trash.php:816
-msgid "restored"
-msgstr ""
-
-#: templates/index.php:9
-msgid "Nothing in here. Your trash bin is empty!"
+#: templates/index.php:26 templates/index.php:28
+msgid "Restore"
 msgstr ""
 
-#: templates/index.php:20 templates/index.php:22
-msgid "Restore"
+#: templates/index.php:34
+msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:30 templates/index.php:31
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr ""
 
diff --git a/l10n/es_MX/user_ldap.po b/l10n/es_MX/user_ldap.po
index 54dc1b5192a24d82cb3aa2951de574bbf386d12e..477199e21397b2339ca9b1f9c27e385ce3513cc5 100644
--- a/l10n/es_MX/user_ldap.po
+++ b/l10n/es_MX/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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:36
+#: ajax/testConfiguration.php:37
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:39
+#: ajax/testConfiguration.php:40
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:43
+#: ajax/testConfiguration.php:44
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr ""
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 845ba80bfd6dbb11b68d2e677f94832a0457d96f..11cae8186b29f3185e0341f1fb5e58e811c28e79 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 17:40+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,45 +58,6 @@ msgstr "Uuendatud failipuhver"
 msgid "... %d%% done ..."
 msgstr "... %d%% tehtud ..."
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Kategooria tüüp puudub."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Pole kategooriat, mida lisada?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "See kategooria on juba olemas: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Objekti tüüb puudub."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID puudub."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Viga %s lisamisel lemmikutesse."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Kustutamiseks pole kategooriat valitud."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Viga %s eemaldamisel lemmikutest."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Ühtegi pilti või faili ei pakutud"
@@ -291,7 +252,7 @@ msgstr "Milliseid faile sa soovid alles hoida?"
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
-msgstr ""
+msgstr "Kui valid mõlemad versioonid, siis lisatakse kopeeritud faili nimele number."
 
 #: js/oc-dialogs.js:376
 msgid "Cancel"
@@ -311,28 +272,7 @@ msgstr "({count} valitud)"
 
 #: js/oc-dialogs.js:457
 msgid "Error loading file exists template"
-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 "Objekti tüüp pole määratletud."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Viga"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Rakenduse nimi ole määratletud."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Vajalikku faili {file} pole paigaldatud!"
+msgstr "Viga faili olemasolu malli laadimisel"
 
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
@@ -342,7 +282,12 @@ msgstr "Jagatud"
 msgid "Share"
 msgstr "Jaga"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Viga"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Viga jagamisel"
 
@@ -374,7 +319,7 @@ msgstr "Jaga lingiga"
 msgid "Password protect"
 msgstr "Parooliga kaitstud"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Parool"
 
@@ -446,30 +391,58 @@ msgstr "kustuta"
 msgid "share"
 msgstr "jaga"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Parooliga kaitstud"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Viga aegumise kuupäeva eemaldamisel"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Viga aegumise kuupäeva määramisel"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Saatmine ..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "E-kiri on saadetud"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Hoiatus"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Objekti tüüp pole määratletud."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Kustuta"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Lisa"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -506,7 +479,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Sinu parooli taastamise link saadetakse sulle e-postile."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Kasutajanimi"
 
@@ -550,7 +523,7 @@ msgstr "Isiklik"
 msgid "Users"
 msgstr "Kasutajad"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Rakendused"
 
@@ -562,6 +535,34 @@ msgstr "Admin"
 msgid "Help"
 msgstr "Abiinfo"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Ligipääs on keelatud"
@@ -591,14 +592,6 @@ msgstr "Jagamine aegub %s.\n\n"
 msgid "Cheers!"
 msgstr "Terekest!"
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Muuda kategooriaid"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Lisa"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -688,12 +681,12 @@ msgstr "Lõpeta seadistamine"
 msgid "Finishing …"
 msgstr "Lõpetamine ..."
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s on saadaval. Vaata lähemalt kuidas uuendada."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Logi välja"
 
@@ -711,19 +704,27 @@ msgstr "Kui sa ei muutnud oma parooli hiljuti, siis võib su kasutajakonto olla
 msgid "Please change your password to secure your account again."
 msgstr "Palun muuda parooli, et oma kasutajakonto uuesti turvata."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr "Serveripoolne autentimine ebaõnnestus!"
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr "Palun kontakteeru oma süsteemihalduriga."
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Kaotasid oma parooli?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "pea meeles"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Logi sisse"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Alternatiivsed sisselogimisviisid"
 
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index c0e88cd6cbf1dd314e0b80222890c94af9517019..f44840197f7a8a1f3c1ccac724a415fc80e311d3 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,15 +76,15 @@ msgstr "Kettale kirjutamine ebaõnnestus"
 msgid "Not enough storage available"
 msgstr "Saadaval pole piisavalt ruumi"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr "Üleslaadimine ebaõnnestus. Faili info hankimine ebaõnnestus."
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Üleslaadimine ebaõnnestus. Üleslaetud faili ei leitud"
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Vigane kaust."
 
@@ -92,36 +92,36 @@ msgstr "Vigane kaust."
 msgid "Files"
 msgstr "Failid"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Ei saa üles laadida {filename}, kuna see on kataloog või selle suurus on 0 baiti"
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Pole piisavalt ruumi"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Üleslaadimine tühistati."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr "Serverist ei saadud tulemusi"
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL ei saa olla tühi."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Vigane kausta nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt."
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Viga"
 
@@ -133,7 +133,7 @@ msgstr "Jaga"
 msgid "Delete permanently"
 msgstr "Kustuta jäädavalt"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Nimeta ümber"
 
@@ -165,13 +165,13 @@ msgstr "asendas nime {old_name} nimega {new_name}"
 msgid "undo"
 msgstr "tagasi"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n kataloog"
 msgstr[1] "%n kataloogi"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fail"
@@ -213,14 +213,14 @@ msgstr "Su andmemaht on peaaegu täis ({usedSpacePercent}%)"
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
-msgstr ""
+msgstr "Krüpteerimisrakend on lubatud, kuid võtmeid pole lähtestatud. Palun logi välja ning uuesti sisse."
 
 #: js/files.js:72
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
-msgstr ""
+msgstr "Vigane Krüpteerimisrakendi privaatvõti . Palun uuenda oma privaatse võtme parool oma personaasete seadete all taastamaks ligipääsu oma krüpteeritud failidele."
 
 #: js/files.js:76
 msgid ""
@@ -228,25 +228,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Krüpteering on keelatud, kuid sinu failid on endiselt krüpteeritud. Palun vaata oma personaalseid seadeid oma failide dekrüpteerimiseks."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. "
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "Viga faili eemaldamisel"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Suurus"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Muudetud"
 
@@ -255,7 +255,7 @@ msgstr "Muudetud"
 msgid "%s could not be renamed"
 msgstr "%s ümbernimetamine ebaõnnestus"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Lae üles"
 
@@ -291,65 +291,65 @@ msgstr "Maksimaalne ZIP-faili sisestatava faili suurus"
 msgid "Save"
 msgstr "Salvesta"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Uus"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Tekstifail"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Kaust"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Allikast"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Kustutatud failid"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Tühista üleslaadimine"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Siin puudvad sul kirjutamisõigused."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Siin pole midagi. Lae midagi üles!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Lõpeta jagamine"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Kustuta"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Üleslaadimine on liiga suur"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Faile skannitakse, palun oota."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Praegune skannimine"
 
diff --git a/l10n/et_EE/files_encryption.po b/l10n/et_EE/files_encryption.po
index 7d195812ab34cf64ce8b9533ee895f6f877629d0..eb1cc2cfc3509f7a9f0d5ec3ae4f81653ee31587 100644
--- a/l10n/et_EE/files_encryption.po
+++ b/l10n/et_EE/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -55,14 +55,14 @@ msgid ""
 "correct."
 msgstr "Ei suutnud uuendada privaatse võtme parooli. Võib-olla polnud vana parool õige."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
-msgstr ""
+msgstr "Krüpteerimise rakend pole käivitatud. Võib-olla krüpteerimise rakend taaskäivitati sinu sessiooni kestel. Palun proovi logida välja ning uuesti sisse käivitamaks krüpteerimise rakendit."
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -70,6 +70,18 @@ msgid ""
 "files."
 msgstr "Sinu privaatne võti pole toimiv! Tõenäoliselt on sinu parool muutunud väljaspool ownCloud süsteemi (näiteks ettevõtte keskhaldus). Sa saad uuendada oma privaatse võtme parooli seadete all taastamaks ligipääsu oma krüpteeritud failidele."
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "Nõutavad on puudu."
@@ -81,7 +93,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Palun veendu, et on paigaldatud PHP 5.3.3 või uuem ning PHP OpenSSL laiendus on lubatud ning seadistatud korrektselt. Hetkel krüpteerimise rakendus on peatatud."
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "Järgmised kasutajad pole seadistatud krüpteeringuks:"
 
@@ -91,97 +103,97 @@ msgstr "Salvestamine..."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
-msgstr ""
+msgstr "Liigu otse oma"
 
 #: templates/invalid_private_key.php:8
 msgid "personal settings"
 msgstr "isiklikes seadetes"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Krüpteerimine"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Luba taastevõti (võimada kasutaja failide taastamine parooli kaotuse puhul):"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "Taastevõtme parool"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
-msgstr ""
+msgstr "Korda taastevõtme parooli"
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Sisse lülitatud"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Väljalülitatud"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "Muuda taastevõtme parooli:"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "Vana taastevõtme parool"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "Uus taastevõtme parool"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
-msgstr ""
+msgstr "Korda uut taastevõtme parooli"
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Muuda parooli"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Sinu privaatse võtme parool ei ühti enam sinu sisselogimise parooliga:"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "Pane oma vana privaatvõtme parooliks oma praegune sisselogimise parool."
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Kui sa ei mäleta oma vana parooli, siis palu oma süsteemihalduril taastada ligipääs failidele."
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Vana sisselogimise parool"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Praegune sisselogimise parool"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "Uuenda privaatse võtme parooli"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Luba parooli taaste:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parooli kaotuse puhul"
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "Faili taaste seaded uuendatud"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "Ei suuda uuendada taastefaili"
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index 358fc25d35c586ffd3c8881f967e85b0208d1645..6c8f069f72a33c57c2b49532945dc0fd6a0ffb00 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 17:48+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,17 +20,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "Parool on vale. Proovi uuesti."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Parool"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Saada"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Vabandust, see link ei tundu enam toimivat."
@@ -55,28 +55,28 @@ msgstr "jagamine on peatatud"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Täpsema info saamiseks palun pöördu lingi saatnud isiku poole."
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s jagas sinuga kausta %s"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s jagas sinuga faili %s"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Lae üles"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Tühista üleslaadimine"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Eelvaadet pole saadaval"
diff --git a/l10n/et_EE/files_trashbin.po b/l10n/et_EE/files_trashbin.po
index 702903680163d1cb4088bc3327aec8fb5d4eca5c..41687c7e6021234bfd9c8f4ddfed98f68c8369e2 100644
--- a/l10n/et_EE/files_trashbin.po
+++ b/l10n/et_EE/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 17:46+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,42 +28,10 @@ msgstr "%s jäädavalt kustutamine ebaõnnestus"
 msgid "Couldn't restore %s"
 msgstr "%s ei saa taastada"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "soorita taastamine"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Viga"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "kustuta fail jäädavalt"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Kustuta jäädavalt"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Nimi"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Kustutatud"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] "%n kataloogi"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n fail"
-msgstr[1] "%n faili"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "taastatud"
@@ -72,11 +40,19 @@ msgstr "taastatud"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Siin pole midagi. Sinu prügikast on tühi!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Nimi"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Taasta"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Kustutatud"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Kustuta"
 
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index 8f617c04fdce33627b3a8cc3f7a1dca6288760cd..f8762ee4e3278ebb96a895cc69af6ade099660dc 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -370,14 +370,18 @@ msgid ""
 msgstr "Vaikimis ownCloud tuvastab automaatselt UUID atribuudi. UUID atribuuti kasutatakse LDAP kasutajate ja gruppide kindlaks tuvastamiseks. Samuti tekitatakse sisemine kasutajanimi UUID alusel, kui pole määratud teisiti. Sa saad tühistada selle seadistuse ning määrata atribuudi omal valikul. Pead veenduma, et valitud atribuut toimib nii kasutajate kui gruppide puhul ning on unikaalne. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi (lisatud) LDAP kasutajate vastendusi."
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "UUID atribuut:"
+msgid "UUID Attribute for Users:"
+msgstr ""
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "LDAP-Kasutajatunnus Kasutaja Vastendus"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -391,18 +395,18 @@ msgid ""
 "experimental stage."
 msgstr "ownCloud kasutab kasutajanime talletamaks ja omistamaks (pseudo) andmeid. Et täpselt tuvastada ja määratleda kasutajaid, peab iga LDAP kasutaja omama sisemist kasutajatunnust. See vajab ownCloud kasutajatunnuse vastendust LDAP kasutajaks. Tekitatud kasutajanimi vastendatakse LDAP kasutaja UUID-iks. Lisaks puhverdatakse DN vähendamaks LDAP päringuid, kuid seda ei kasutata tuvastamisel. ownCloud suudab tuvastada ka DN muutumise. ownCloud sisemist kasutajatunnust kasutatakse üle kogu ownCloudi. Eemaldates vastenduse tekivad kõikjal andmejäägid. Vastenduste eemaldamine ei ole konfiguratsiooni tundlik, see mõjutab kõiki LDAP seadistusi! Ära kunagi eemalda vastendusi produktsioonis! Seda võid teha ainult testis või katsetuste masinas."
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Puhasta LDAP-Grupinimi Grupp Vastendus"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Testi seadistust"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Abiinfo"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 741e2bdfee7876f118b8bc48f9d48adaf348e6b6..72d82b8204245efeaf70e63524b628375a381074 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -58,45 +58,6 @@ msgstr ""
 msgid "... %d%% done ..."
 msgstr ""
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Kategoria mota ez da zehaztu."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Ez dago gehitzeko kategoriarik?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Kategoria hau dagoeneko existitzen da: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Objetu mota ez da zehaztu."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID mota ez da zehaztu."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Errorea gertatu da %s gogokoetara gehitzean."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Ez da ezabatzeko kategoriarik hautatu."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Errorea gertatu da %s gogokoetatik ezabatzean."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -313,27 +274,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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 "Objetu mota ez dago zehaztuta."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Errorea"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "App izena ez dago zehaztuta."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Beharrezkoa den {file} fitxategia ez dago instalatuta!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Elkarbanatuta"
@@ -342,7 +282,12 @@ msgstr "Elkarbanatuta"
 msgid "Share"
 msgstr "Elkarbanatu"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Errorea"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Errore bat egon da elkarbanatzean"
 
@@ -374,7 +319,7 @@ msgstr "Elkarbanatu lotura batekin"
 msgid "Password protect"
 msgstr "Babestu pasahitzarekin"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Pasahitza"
 
@@ -446,30 +391,58 @@ msgstr "ezabatu"
 msgid "share"
 msgstr "elkarbanatu"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Pasahitzarekin babestuta"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Errorea izan da muga data kentzean"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Errore bat egon da muga data ezartzean"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Bidaltzen ..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Eposta bidalia"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Abisua"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Objetu mota ez dago zehaztuta."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Ezabatu"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Gehitu"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -506,7 +479,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Erabiltzaile izena"
 
@@ -550,7 +523,7 @@ msgstr "Pertsonala"
 msgid "Users"
 msgstr "Erabiltzaileak"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Aplikazioak"
 
@@ -562,6 +535,34 @@ msgstr "Admin"
 msgid "Help"
 msgstr "Laguntza"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Sarrera debekatuta"
@@ -591,14 +592,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Editatu kategoriak"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Gehitu"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -688,12 +681,12 @@ msgstr "Bukatu konfigurazioa"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Saioa bukatu"
 
@@ -711,19 +704,27 @@ msgstr "Zure pasahitza orain dela gutxi ez baduzu aldatu, zure kontua arriskuan
 msgid "Please change your password to secure your account again."
 msgstr "Mesedez aldatu zure pasahitza zure kontua berriz segurtatzeko."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Galdu duzu pasahitza?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "gogoratu"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Hasi saioa"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Beste erabiltzaile izenak"
 
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 0de4715c44d59cefa3e7e01ec62174926be15f93..9667166de1ccc79ef56b69418846457710c81ad7 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 11:40+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+0000\n"
 "Last-Translator: asieriko <asieriko@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -76,15 +76,15 @@ msgstr "Errore bat izan da diskoan idazterakoan"
 msgid "Not enough storage available"
 msgstr "Ez dago behar aina leku erabilgarri,"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr "Igoerak huts egin du. Ezin izan da fitxategiaren informazioa eskuratu."
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Igoerak huts egin du. Ezin izan da igotako fitxategia aurkitu"
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Baliogabeko karpeta."
 
@@ -92,36 +92,36 @@ msgstr "Baliogabeko karpeta."
 msgid "Files"
 msgstr "Fitxategiak"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Ezin da {filename} igo karpeta bat delako edo 0 byte dituelako"
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Ez dago leku nahikorik."
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Igoera ezeztatuta"
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr "Ezin da zerbitzaritik emaitzik lortu"
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URLa ezin da hutsik egon."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Karpeta izne baliogabea. \"Shared\" karpeta erabilpena OwnCloudentzat erreserbaturik dago."
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Errorea"
 
@@ -133,7 +133,7 @@ msgstr "Elkarbanatu"
 msgid "Delete permanently"
 msgstr "Ezabatu betirako"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Berrizendatu"
 
@@ -165,13 +165,13 @@ msgstr " {new_name}-k {old_name} ordezkatu du"
 msgid "undo"
 msgstr "desegin"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "karpeta %n"
 msgstr[1] "%n karpeta"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "fitxategi %n"
@@ -228,25 +228,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Enkriptazioa desgaitua izan da baina zure fitxategiak oraindik enkriptatuta daude. Mesedez  jo zure ezarpen pertsonaletara zure fitxategiak dekodifikatzeko."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. "
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "Errorea fitxategia mugitzean"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Izena"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Tamaina"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Aldatuta"
 
@@ -255,7 +255,7 @@ msgstr "Aldatuta"
 msgid "%s could not be renamed"
 msgstr "%s ezin da berrizendatu"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Igo"
 
@@ -291,65 +291,65 @@ msgstr "ZIP fitxategien gehienezko tamaina"
 msgid "Save"
 msgstr "Gorde"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Berria"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Testu fitxategia"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Karpeta"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Estekatik"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Ezabatutako fitxategiak"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Ezeztatu igoera"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Ez duzu hemen idazteko baimenik."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Ez dago ezer. Igo zerbait!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Ez elkarbanatu"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Igoera handiegia da"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Orain eskaneatzen ari da"
 
diff --git a/l10n/eu/files_encryption.po b/l10n/eu/files_encryption.po
index 5c6eb3d83dcf0c5118c7011bd9a9f32c2ceb8f2f..84ff65979164821b72ecc1d35ee32868cb2475a8 100644
--- a/l10n/eu/files_encryption.po
+++ b/l10n/eu/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -56,14 +56,14 @@ msgid ""
 "correct."
 msgstr "Ezin izan da gako pribatu pasahitza eguneratu. Agian pasahitz zaharra okerrekoa da."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -71,6 +71,18 @@ msgid ""
 "files."
 msgstr "Zure gako pribatua ez da egokia! Seguruaski zure pasahitza ownCloud sistematik kanpo aldatu da (adb. zure direktorio korporatiboa). Zure gako pribatuaren pasahitza eguneratu dezakezu zure ezarpen pertsonaletan zure enkriptatutako fitxategiak berreskuratzeko."
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "Eskakizun batzuk ez dira betetzen."
@@ -82,7 +94,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Mesedez ziurtatu PHP 5.3.3 edo berriago bat instalatuta dagoela eta OpenSSL PHP hedapenarekin gaitua eta ongi konfiguratuta dagoela. Oraingoz, enkriptazio aplikazioa desgaituta dago."
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:"
 
@@ -98,91 +110,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "ezarpen pertsonalak"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Enkriptazioa"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Gaitu berreskurapen gakoa (erabiltzaileen fitxategiak berreskuratzea ahalbidetzen du pasahitza galtzen badute ere):"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "Berreskuratze gako pasahitza"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Gaitua"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Ez-gaitua"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "Aldatu berreskuratze gako pasahitza:"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "Berreskuratze gako pasahitz zaharra"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "Berreskuratze gako pasahitz berria"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Aldatu Pasahitza"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Zure gako pribatuaren pasahitza ez da dagoeneko zure sarrera pasahitza:"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "Ezarri zure gako pribatu zaharraren pasahitza zure oraingo sarrerako psahitzara."
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Ez baduzu zure pasahitz zaharra gogoratzen eskatu zure administratzaileari zure fitxategiak berreskuratzeko."
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Sartzeko pasahitz zaharra"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Sartzeko oraingo pasahitza"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "Eguneratu gako pribatu pasahitza"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Gaitu pasahitz berreskuratzea:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Aukera hau gaituz zure enkriptatutako fitxategiak berreskuratu ahal izango dituzu pasahitza galtzekotan"
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "Fitxategi berreskuratze ezarpenak eguneratuak"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "Ezin da fitxategi berreskuratzea eguneratu"
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index ce629410a61ed944d7064f3d29b5c21fdd9c7d18..ab7750234fe4b0bd38e6a0ffb6cb8bc2eb03692c 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/files_sharing.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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "Pasahitza ez da egokia. Saiatu berriro."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Pasahitza"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Bidali"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Barkatu, lotura ez dirudi eskuragarria dagoenik."
@@ -54,28 +54,28 @@ msgstr "elkarbanatzea ez dago gaituta"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Informazio gehiagorako, mesedez eskatu lotura hau bidali zuen pertsonari"
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%sk zurekin %s karpeta elkarbanatu du"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%sk zurekin %s fitxategia elkarbanatu du"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Igo"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Ezeztatu igoera"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Ez dago aurrebista eskuragarririk hauentzat "
diff --git a/l10n/eu/files_trashbin.po b/l10n/eu/files_trashbin.po
index 1daada37714da776f93bb4cc9fcbc66a6cec6bc3..e671b30f70e261c909a57193281d0cfe04e1a9f4 100644
--- a/l10n/eu/files_trashbin.po
+++ b/l10n/eu/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -28,42 +28,10 @@ msgstr "Ezin izan da %s betirako ezabatu"
 msgid "Couldn't restore %s"
 msgstr "Ezin izan da %s berreskuratu"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "berreskuratu"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Errorea"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "ezabatu fitxategia betirako"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Ezabatu betirako"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Izena"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Ezabatuta"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "karpeta %n"
-msgstr[1] "%n karpeta"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "fitxategi %n"
-msgstr[1] "%n fitxategi"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "Berrezarrita"
@@ -72,11 +40,19 @@ msgstr "Berrezarrita"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Ez dago ezer ez. Zure zakarrontzia hutsik dago!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Izena"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Berrezarri"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Ezabatuta"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Ezabatu"
 
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index e54163f03be19316b51000c057bb0c65efbde0e6..2ee5871f0bd0b2ed46c508e3a3412cb36505d52d 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -369,14 +369,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -390,18 +394,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Egiaztatu Konfigurazioa"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Laguntza"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 363ef0b9eaa62b92e179b11b3a80d6a83dbd94c7..9dd1b35a352245983c114f5d6f5949307dcd994c 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:31+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -57,45 +57,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 "این دسته هم اکنون وجود دارد: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "نوع شی ارائه نشده است."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "شناسه %s  ارائه نشده است."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "خطای اضافه کردن %s  به علاقه مندی ها."
-
-#: 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 "خطای پاک کردن %s از علاقه مندی ها."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -307,27 +268,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "اشتراک گذاشته شده"
@@ -336,7 +276,12 @@ msgstr "اشتراک گذاشته شده"
 msgid "Share"
 msgstr "اشتراک‌گذاری"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "خطا"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "خطا درحال به اشتراک گذاشتن"
 
@@ -368,7 +313,7 @@ msgstr "به اشتراک گذاشتن با پیوند"
 msgid "Password protect"
 msgstr "نگهداری کردن رمز عبور"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "گذرواژه"
 
@@ -440,30 +385,58 @@ msgstr "پاک کردن"
 msgid "share"
 msgstr "به اشتراک گذاشتن"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "نگهداری از رمز عبور"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "خطا در تنظیم نکردن تاریخ انقضا "
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "خطا در تنظیم تاریخ انقضا"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "درحال ارسال ..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "ایمیل ارسال شد"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "اخطار"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "نوع شی تعیین نشده است."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "حذف"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "افزودن"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -500,7 +473,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "نام کاربری"
 
@@ -544,7 +517,7 @@ msgstr "شخصی"
 msgid "Users"
 msgstr "کاربران"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "  برنامه ها"
 
@@ -556,6 +529,34 @@ msgstr "مدیر"
 msgid "Help"
 msgstr "راه‌نما"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "اجازه دسترسی به مناطق ممنوعه را ندارید"
@@ -585,14 +586,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "ویرایش گروه"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "افزودن"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -682,12 +675,12 @@ msgstr "اتمام نصب"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s در دسترس است. برای چگونگی به روز رسانی اطلاعات بیشتر را دریافت نمایید."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "خروج"
 
@@ -705,19 +698,27 @@ msgstr "اگر شما اخیرا رمزعبور را تغییر نداده ای
 msgid "Please change your password to secure your account again."
 msgstr "لطفا رمز عبور خود را تغییر دهید تا مجددا حساب شما  در امان باشد."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "آیا گذرواژه تان را به یاد نمی آورید؟"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "بیاد آوری"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "ورود"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "ورود متناوب"
 
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 2117e92f8028ab796ffe70684c2b6403e9bdfdc2..eeb87d689be6163c2a0c4ef34c360dce5cbc9688 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -75,15 +75,15 @@ msgstr "نوشتن بر روی دیسک سخت ناموفق بود"
 msgid "Not enough storage available"
 msgstr "فضای کافی در دسترس نیست"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "فهرست راهنما نامعتبر می باشد."
 
@@ -91,36 +91,36 @@ msgstr "فهرست راهنما نامعتبر می باشد."
 msgid "Files"
 msgstr "پرونده‌ها"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "فضای کافی در دسترس نیست"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "بار گذاری لغو شد"
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. "
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL  نمی تواند خالی باشد."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "نام پوشه نامعتبر است. استفاده از 'به اشتراک گذاشته شده' متعلق به ownCloud میباشد."
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "خطا"
 
@@ -132,7 +132,7 @@ msgstr "اشتراک‌گذاری"
 msgid "Delete permanently"
 msgstr "حذف قطعی"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "تغییرنام"
 
@@ -164,12 +164,12 @@ msgstr "{نام_جدید} با { نام_قدیمی} جایگزین شد."
 msgid "undo"
 msgstr "بازگشت"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -224,25 +224,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "نام"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "اندازه"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "تاریخ"
 
@@ -251,7 +251,7 @@ msgstr "تاریخ"
 msgid "%s could not be renamed"
 msgstr "%s نمیتواند تغییر نام دهد."
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "بارگزاری"
 
@@ -287,65 +287,65 @@ msgstr "حداکثرمقدار برای بار گزاری پرونده های ف
 msgid "Save"
 msgstr "ذخیره"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "جدید"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "فایل متنی"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "پوشه"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "از پیوند"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "فایل های حذف شده"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "متوقف کردن بار گذاری"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "شما اجازه ی نوشتن در اینجا را ندارید"
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "اینجا هیچ چیز نیست."
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "دانلود"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "لغو اشتراک"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "حذف"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد"
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "پرونده ها در حال بازرسی هستند لطفا صبر کنید"
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "بازرسی کنونی"
 
diff --git a/l10n/fa/files_encryption.po b/l10n/fa/files_encryption.po
index 4ec1a7fd3d4f7ce8ceefc0df6c8f983a7723e25c..ac3b1abfdc19e24a226bfcd6aac7c5ddd4d2f02d 100644
--- a/l10n/fa/files_encryption.po
+++ b/l10n/fa/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -54,14 +54,14 @@ msgid ""
 "correct."
 msgstr "رمزعبور کلید خصوصی را نمی تواند به روز کند. شاید رمزعبور قدیمی صحیح نمی باشد."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -69,6 +69,18 @@ msgid ""
 "files."
 msgstr "کلید خصوصی شما معتبر نمی باشد!  ظاهرا رمزعبور شما بیرون از سیستم ownCloud تغییر یافته است( به عنوان مثال پوشه سازمان شما ). شما میتوانید رمزعبور کلید خصوصی خود را در تنظیمات شخصیتان به روز کنید تا بتوانید به  فایل های رمزگذاری شده خود را دسترسی داشته باشید."
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "نیازمندی های گمشده"
@@ -80,7 +92,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -96,91 +108,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "تنظیمات شخصی"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "رمزگذاری"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "فعال کردن کلید بازیابی(اجازه بازیابی فایل های کاربران در صورت از دست دادن رمزعبور):"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "رمزعبور کلید بازیابی"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "فعال شده"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "غیرفعال شده"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "تغییر رمزعبور کلید بازیابی:"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "رمزعبور قدیمی  کلید بازیابی "
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "رمزعبور جدید کلید بازیابی"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "تغییر رمزعبور"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "رمزعبور کلید خصوصی شما با رمزعبور شما یکسان نیست :"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "رمزعبور قدیمی  کلید خصوصی خود را با رمزعبور فعلی تنظیم نمایید."
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "اگر رمزعبور قدیمی را فراموش کرده اید میتوانید از مدیر خود برای بازیابی فایل هایتان درخواست نمایید."
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "رمزعبور قدیمی"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "رمزعبور فعلی"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "به روز رسانی رمزعبور کلید خصوصی"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "فعال سازی بازیابی رمزعبور:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "فعال کردن این گزینه به شما اجازه خواهد داد در صورت از دست دادن رمزعبور به فایل های رمزگذاری شده خود دسترسی داشته باشید."
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "تنظیمات بازیابی فایل به روز شده است."
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "به روز رسانی بازیابی فایل را نمی تواند انجام دهد."
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index 14a3c4edfa7251c355aa1dfc224b8d3efb227092..b74820ae6b0d50f5f5b24ba0b1fe3d6dff7952f0 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "رمزعبور اشتباه می باشد. دوباره امتحان کنید."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "گذرواژه"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "ثبت"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -54,28 +54,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%sپوشه %s را با شما به اشتراک گذاشت"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%sفایل %s را با شما به اشتراک گذاشت"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "دانلود"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "بارگزاری"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "متوقف کردن بار گذاری"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "هیچگونه پیش نمایشی موجود نیست"
diff --git a/l10n/fa/files_trashbin.po b/l10n/fa/files_trashbin.po
index 28c2687c75b4372954cb26dfe7fbaa1f1d7f4ed3..8e79601363ce234ef5851d0dcf0a4f8cab125afb 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -27,40 +27,10 @@ msgstr "%s را نمی توان برای همیشه حذف کرد"
 msgid "Couldn't restore %s"
 msgstr "%s را نمی توان بازگرداند"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "انجام عمل بازگرداندن"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "خطا"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "حذف فایل برای همیشه"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "حذف قطعی"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "نام"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "حذف شده"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -69,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "هیچ چیزی اینجا نیست. سطل زباله ی شما خالی است."
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "نام"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "بازیابی"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "حذف شده"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "حذف"
 
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index a17c03601361b3d4683d2aa50ca01b2593591761..33285ec6094cbbf728871710346612668a133ae5 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -369,14 +369,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "صفت UUID:"
+msgid "UUID Attribute for Users:"
+msgstr ""
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "نام کاربری - نگاشت کاربر LDAP "
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -390,18 +394,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "پاک کردن نام کاربری- LDAP  نگاشت کاربر "
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "پاک کردن نام گروه -LDAP گروه نقشه برداری"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "امتحان پیکربندی"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "راه‌نما"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index de7fcaf44ce7cfc7dd02d992b1f31edb6f2b7610..dfcc184fe79ab7a5f35f8370558c41e18456fba8 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -58,45 +58,6 @@ msgstr "Tiedostojen välimuisti päivitetty"
 msgid "... %d%% done ..."
 msgstr "... %d%% valmis ..."
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Luokan tyyppiä ei määritelty."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Ei lisättävää luokkaa?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Luokka on jo olemassa: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr ""
-
-#: 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 "Virhe lisätessä kohdetta %s suosikkeihin."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Luokkia ei valittu poistettavaksi."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Virhe poistaessa kohdetta %s suosikeista."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Kuvaa tai tiedostoa ei määritelty"
@@ -313,27 +274,6 @@ msgstr "({count} valittu)"
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Virhe"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Sovelluksen nimeä ei ole määritelty."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Vaadittua tiedostoa {file} ei ole asennettu!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Jaettu"
@@ -342,7 +282,12 @@ msgstr "Jaettu"
 msgid "Share"
 msgstr "Jaa"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Virhe"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Virhe jaettaessa"
 
@@ -374,7 +319,7 @@ msgstr "Jaa linkillä"
 msgid "Password protect"
 msgstr "Suojaa salasanalla"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Salasana"
 
@@ -446,30 +391,58 @@ msgstr "poista"
 msgid "share"
 msgstr "jaa"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Salasanasuojattu"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Virhe purettaessa eräpäivää"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Virhe päättymispäivää asettaessa"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Lähetetään..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Sähköposti lähetetty"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Varoitus"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Poista"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Lisää"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -506,7 +479,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Saat sähköpostitse linkin nollataksesi salasanan."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Käyttäjätunnus"
 
@@ -550,7 +523,7 @@ msgstr "Henkilökohtainen"
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Sovellukset"
 
@@ -562,6 +535,34 @@ msgstr "Ylläpitäjä"
 msgid "Help"
 msgstr "Ohje"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Pääsy estetty"
@@ -591,14 +592,6 @@ msgstr "Jakaminen päättyy %s.\n\n"
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Muokkaa luokkia"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Lisää"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -688,12 +681,12 @@ msgstr "Viimeistele asennus"
 msgid "Finishing …"
 msgstr "Valmistellaan…"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Kirjaudu ulos"
 
@@ -711,19 +704,27 @@ msgstr "Jos et vaihtanut salasanaasi äskettäin, tilisi saattaa olla murrettu."
 msgid "Please change your password to secure your account again."
 msgstr "Vaihda salasanasi suojataksesi tilisi uudelleen."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr "Palvelimen puoleinen tunnistautuminen epäonnistui!"
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr "Ota yhteys ylläpitäjään."
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Unohditko salasanasi?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "muista"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Kirjaudu sisään"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Vaihtoehtoiset kirjautumiset"
 
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 345dc6cacd22aa8186e7fb99fffe9039c57eca63..535a2145cf783f469df30ad8958ef0656c5643f4 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -75,15 +75,15 @@ msgstr "Levylle kirjoitus epäonnistui"
 msgid "Not enough storage available"
 msgstr "Tallennustilaa ei ole riittävästi käytettävissä"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Virheellinen kansio."
 
@@ -91,36 +91,36 @@ msgstr "Virheellinen kansio."
 msgid "Files"
 msgstr "Tiedostot"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Kohdetta {filename} ei voi lähettää, koska se on joko kansio tai sen koko on 0 tavua"
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Tilaa ei ole riittävästi"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Lähetys peruttu."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr "Tuloksien saaminen palvelimelta ei onnistunut."
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "Verkko-osoite ei voi olla tyhjä"
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Virhe"
 
@@ -132,7 +132,7 @@ msgstr "Jaa"
 msgid "Delete permanently"
 msgstr "Poista pysyvästi"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
@@ -164,13 +164,13 @@ msgstr ""
 msgid "undo"
 msgstr "kumoa"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n kansio"
 msgstr[1] "%n kansiota"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n tiedosto"
@@ -227,25 +227,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "Virhe tiedostoa siirrettäessä"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Koko"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Muokattu"
 
@@ -254,7 +254,7 @@ msgstr "Muokattu"
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Lähetä"
 
@@ -290,65 +290,65 @@ msgstr "ZIP-tiedostojen enimmäiskoko"
 msgid "Save"
 msgstr "Tallenna"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Uusi"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Tekstitiedosto"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Kansio"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Linkistä"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Poistetut tiedostot"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Peru lähetys"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Tunnuksellasi ei ole kirjoitusoikeuksia tänne."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Täällä ei ole mitään. Lähetä tänne jotakin!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Lataa"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Peru jakaminen"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Poista"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Lähetettävä tiedosto on liian suuri"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Tiedostoja tarkistetaan, odota hetki."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Tämänhetkinen tutkinta"
 
diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po
index 4262f5e872b3c3134f30d311da520bac0e80c0e3..c2ed9484aedf66f00f042afa207058547bb4719d 100644
--- a/l10n/fi_FI/files_encryption.po
+++ b/l10n/fi_FI/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -55,14 +55,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -70,6 +70,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -81,7 +93,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "Seuraavat käyttäjät eivät ole määrittäneet salausta:"
 
@@ -97,91 +109,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "henkilökohtaiset asetukset"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Salaus"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "Palautusavaimen salasana"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Ei käytössä"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "Vaihda palautusavaimen salasana:"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "Vanha palautusavaimen salasana"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "Uusi palautusavaimen salasana"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Vaihda salasana"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Vanha kirjautumis-salasana"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Nykyinen kirjautumis-salasana"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Ota salasanan palautus käyttöön:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index a2ffb0fc8272e8557ec31bf7b4a1fc1686dd4804..742405ea6d316a6d7b1bcdaa3d6de9f4dc675a42 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 06:30+0000\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr "Tämä jako on suojattu salasanalla"
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "Väärä salasana. Yritä uudelleen."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Salasana"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Lähetä"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Valitettavasti linkki ei vaikuta enää toimivan."
@@ -54,28 +54,28 @@ msgstr "jakaminen on poistettu käytöstä"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Kysy lisätietoja henkilöltä, jolta sait linkin."
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s jakoi kansion %s kanssasi"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s jakoi tiedoston %s kanssasi"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Lataa"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Lähetä"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Peru lähetys"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Ei esikatselua kohteelle"
diff --git a/l10n/fi_FI/files_trashbin.po b/l10n/fi_FI/files_trashbin.po
index 38def67d241f4856949791cf6148d6b835125918..165313c167837838e1a56f04c989269eae42141e 100644
--- a/l10n/fi_FI/files_trashbin.po
+++ b/l10n/fi_FI/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -28,42 +28,10 @@ msgstr "Kohdetta %s ei voitu poistaa pysyvästi"
 msgid "Couldn't restore %s"
 msgstr "Kohteen %s palautus epäonnistui"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "suorita palautustoiminto"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Virhe"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "poista tiedosto pysyvästi"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Poista pysyvästi"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Nimi"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Poistettu"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n kansio"
-msgstr[1] "%n kansiota"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n tiedosto"
-msgstr[1] "%n tiedostoa"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "palautettu"
@@ -72,11 +40,19 @@ msgstr "palautettu"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Tyhjää täynnä! Roskakorissa ei ole mitään."
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Nimi"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Palauta"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Poistettu"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Poista"
 
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 3b7670dea69d3f207b9d9d824bfd238c549aeab9..6dd0d9dd223a9891900f844efd10524f4df4210d 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Ohje"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 449965569858c446209b34ca9f2219b597692fdf..93e53eca95e7dca8cca93f6c36b334c22a930392 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -5,6 +5,7 @@
 # Translators:
 # Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
 # Christophe Lherieau <skimpax@gmail.com>, 2013
+# etiess <etiess@gmail.com>, 2013
 # msoko <sokolovitch@yahoo.com>, 2013
 # ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
 # plachance <patlachance@gmail.com>, 2013
@@ -13,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:31+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -31,7 +32,7 @@ msgstr "%s partagé »%s« avec vous"
 #: ajax/share.php:168
 #, php-format
 msgid "Couldn't send mail to following users: %s "
-msgstr ""
+msgstr "Impossible d'envoyer un mail aux utilisateurs suivant : %s"
 
 #: ajax/share.php:327
 msgid "group"
@@ -62,45 +63,6 @@ msgstr "Cache de fichier mis à jour"
 msgid "... %d%% done ..."
 msgstr "... %d%% effectué ..."
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Type de catégorie non spécifié."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Pas de catégorie à ajouter ?"
-
-#: ajax/vcategories/add.php:37
-#, 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
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Type d'objet non spécifié."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "L'identifiant de %s n'est pas spécifié."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Erreur lors de l'ajout de %s aux favoris."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Pas de catégorie sélectionnée pour la suppression."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Erreur lors de la suppression de %s des favoris."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Aucune image ou fichier fourni"
@@ -317,27 +279,6 @@ msgstr "({count} sélectionnés)"
 msgid "Error loading file exists template"
 msgstr "Erreur de chargement du modèle de fichier existant"
 
-#: 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 "Le type d'objet n'est pas spécifié."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Erreur"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Le nom de l'application n'est pas spécifié."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Le fichier requis {file} n'est pas installé !"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Partagé"
@@ -346,7 +287,12 @@ msgstr "Partagé"
 msgid "Share"
 msgstr "Partager"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Erreur"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Erreur lors de la mise en partage"
 
@@ -378,7 +324,7 @@ msgstr "Partager via lien"
 msgid "Password protect"
 msgstr "Protéger par un mot de passe"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -424,7 +370,7 @@ msgstr "Ne plus partager"
 
 #: js/share.js:353
 msgid "notify user by email"
-msgstr ""
+msgstr "Prévenir l'utilisateur par couriel"
 
 #: js/share.js:361
 msgid "can edit"
@@ -450,30 +396,58 @@ msgstr "supprimer"
 msgid "share"
 msgstr "partager"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Protégé par un mot de passe"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Une erreur est survenue pendant la suppression de la date d'expiration"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Erreur lors de la spécification de la date d'expiration"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "En cours d'envoi ..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Email envoyé"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Attention"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Le type d'objet n'est pas spécifié."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Supprimer"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Ajouter"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -510,7 +484,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
@@ -554,7 +528,7 @@ msgstr "Personnel"
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Applications"
 
@@ -566,6 +540,34 @@ msgstr "Administration"
 msgid "Help"
 msgstr "Aide"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Accès interdit"
@@ -582,26 +584,18 @@ msgid ""
 "just letting you know that %s shared %s with you.\n"
 "View it: %s\n"
 "\n"
-msgstr ""
+msgstr "Bonjour,\n\nJuste pour vous signaler que %s a partagé %s avec vous.\nConsultez-le : %s\n"
 
 #: templates/altmail.php:4
 #, php-format
 msgid ""
 "The share will expire on %s.\n"
 "\n"
-msgstr ""
+msgstr "Le partage expire le %s.\n\n"
 
 #: templates/altmail.php:6 templates/mail.php:19
 msgid "Cheers!"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Editer les catégories"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Ajouter"
+msgstr "Salutations!"
 
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
@@ -690,14 +684,14 @@ msgstr "Terminer l'installation"
 
 #: templates/installation.php:184
 msgid "Finishing …"
-msgstr ""
+msgstr "En cours de finalisation..."
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s est disponible. Obtenez plus d'informations sur la façon de mettre à jour."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Se déconnecter"
 
@@ -715,19 +709,27 @@ msgstr "Si vous n'avez pas changé votre mot de passe récemment, votre compte r
 msgid "Please change your password to secure your account again."
 msgstr "Veuillez changer votre mot de passe pour sécuriser à nouveau votre compte."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr "L'authentification côté serveur a échoué !"
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr "Veuillez contacter votre administrateur."
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Mot de passe perdu ?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "se souvenir de moi"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Connexion"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Logins alternatifs"
 
@@ -736,12 +738,12 @@ msgstr "Logins alternatifs"
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>"
-msgstr ""
+msgstr "Bonjour,<br><br>Juste pour vous informer que %s a partagé »%s« avec vous.<br><a href=\"%s\">Consultez-le !</a><br><br>"
 
 #: templates/mail.php:17
 #, php-format
 msgid "The share will expire on %s.<br><br>"
-msgstr ""
+msgstr "Le partage expirera le %s.<br><br>"
 
 #: templates/update.php:3
 #, php-format
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index c76c180c2677cd4bef4cb77294d0d94d17ca8a52..519806d8d33168a12415cecca3820a85a5b2fe8f 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+0000\n"
+"Last-Translator: ogre_sympathique <ogre.sympathique@speed.1s.fr>\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"
@@ -78,15 +78,15 @@ msgstr "Erreur d'écriture sur le disque"
 msgid "Not enough storage available"
 msgstr "Plus assez d'espace de stockage disponible"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr "L'envoi a échoué. Impossible d'obtenir les informations du fichier."
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr "L'envoi a échoué. Impossible de trouver le fichier envoyé."
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Dossier invalide."
 
@@ -94,36 +94,36 @@ msgstr "Dossier invalide."
 msgid "Files"
 msgstr "Fichiers"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Impossible d'envoyer {filename} car il s'agit d'un répertoire ou d'un fichier de taille nulle"
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Espace disponible insuffisant"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Envoi annulé."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr "Ne peut recevoir les résultats du serveur."
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "L'URL ne peut-être vide"
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Erreur"
 
@@ -135,7 +135,7 @@ msgstr "Partager"
 msgid "Delete permanently"
 msgstr "Supprimer de façon définitive"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Renommer"
 
@@ -167,13 +167,13 @@ msgstr "{new_name} a été remplacé par {old_name}"
 msgid "undo"
 msgstr "annuler"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n dossier"
 msgstr[1] "%n dossiers"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fichier"
@@ -215,14 +215,14 @@ msgstr "Votre espace de stockage est presque plein ({usedSpacePercent}%)"
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
-msgstr ""
+msgstr "L'application de chiffrement est activée mais vos clés ne sont pas initialisées, veuillez vous déconnecter et ensuite vous reconnecter."
 
 #: js/files.js:72
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
-msgstr ""
+msgstr "Votre clef privée pour l'application de chiffrement est invalide ! Veuillez mettre à jour le mot de passe de votre clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés."
 
 #: js/files.js:76
 msgid ""
@@ -230,25 +230,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Le chiffrement était désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos Paramètres personnels pour déchiffrer vos fichiers."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "Erreur lors du déplacement du fichier"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Taille"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Modifié"
 
@@ -257,7 +257,7 @@ msgstr "Modifié"
 msgid "%s could not be renamed"
 msgstr "%s ne peut être renommé"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Envoyer"
 
@@ -293,65 +293,65 @@ msgstr "Taille maximale pour les fichiers ZIP"
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nouveau"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Fichier texte"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Dossier"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Depuis le lien"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Fichiers supprimés"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Annuler l'envoi"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Vous n'avez pas le droit d'écriture ici."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Il n'y a rien ici ! Envoyez donc quelque chose :)"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Télécharger"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Ne plus partager"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Supprimer"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Téléversement trop volumineux"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Les fichiers sont en cours d'analyse, veuillez patienter."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Analyse en cours"
 
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
index c9033cf761852cfc60b0e6a0d96d7df1894ea104..24c4b20fe2d7d02e567652d2bf16dddbe197c5d7 100644
--- a/l10n/fr/files_encryption.po
+++ b/l10n/fr/files_encryption.po
@@ -5,14 +5,16 @@
 # Translators:
 # Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
 # Christophe Lherieau <skimpax@gmail.com>, 2013
+# etiess <etiess@gmail.com>, 2013
 # froozeify <froozeify@mail.com>, 2013
 # lyly95, 2013
+# ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -57,14 +59,14 @@ msgid ""
 "correct."
 msgstr "Impossible de mettre à jour le mot de passe de la clé privé. Peut-être que l'ancien mot de passe n'était pas correcte."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
-msgstr ""
+msgstr "L'application de chiffrement n'est pas initialisée ! Peut-être que cette application a été réactivée pendant votre session. Veuillez essayer de vous déconnecter et ensuite de vous reconnecter pour initialiser l'application de chiffrement."
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -72,6 +74,18 @@ msgid ""
 "files."
 msgstr "Votre clé de sécurité privée n'est pas valide! Il est probable que votre mot de passe ait été changé sans passer par le système ownCloud (par éxemple: le serveur de votre entreprise). Ain d'avoir à nouveau accès à vos fichiers cryptés, vous pouvez mettre à jour votre clé de sécurité privée dans les paramètres personnels de votre compte."
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "Système minimum requis non respecté."
@@ -83,7 +97,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Veuillez vous assurer qu'une version de PHP 5.3.3 ou supérieure est installée et qu'OpenSSL et son extension PHP sont activés et configurés correctement. En attendant, l'application de chiffrement été désactivée."
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :"
 
@@ -93,97 +107,97 @@ msgstr "Enregistrement..."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
-msgstr ""
+msgstr "Allez directement à votre"
 
 #: templates/invalid_private_key.php:8
 msgid "personal settings"
 msgstr "paramètres personnel"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Chiffrement"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe)."
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "Mot de passe de la clef de récupération"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
-msgstr ""
+msgstr "Répétez le mot de passe de la clé de récupération"
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Activer"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Désactiver"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "Modifier le mot de passe de la clef de récupération :"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "Ancien mot de passe de la clef de récupération"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "Nouveau mot de passe de la clef de récupération"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
-msgstr ""
+msgstr "Répétez le nouveau mot de passe de la clé de récupération"
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Changer de mot de passe"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion :"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "Configurez le mot de passe de votre ancienne clef privée avec votre mot de passe courant de connexion. "
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Si vous ne vous souvenez plus de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers."
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Ancien mot de passe de connexion"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Actuel mot de passe de connexion"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "Mettre à jour le mot de passe de votre clé privée"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Activer la récupération du mot de passe :"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe"
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "Paramètres de récupération de fichiers mis à jour"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "Ne peut pas remettre à jour les fichiers de récupération"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index 3e69326d28dc2e591652e479a9d40f74021ded8c..09f2de94794e6b916c2f2c4b50ad61deb1beeb3d 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -5,13 +5,14 @@
 # Translators:
 # square <benben390-390@yahoo.fr>, 2013
 # Christophe Lherieau <skimpax@gmail.com>, 2013
+# ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-04 14:11+0000\n"
-"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-12 12:30+0000\n"
+"Last-Translator: ogre_sympathique <ogre.sympathique@speed.1s.fr>\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"
@@ -20,17 +21,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr "Ce partage est protégé par un mot de passe"
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "Le mot de passe est incorrect. Veuillez réessayer."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Mot de passe"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Envoyer"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Désolé, mais le lien semble ne plus fonctionner."
@@ -55,28 +56,28 @@ msgstr "le partage est désactivé"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Pour plus d'informations, veuillez contacter la personne qui a envoyé ce lien."
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s a partagé le répertoire %s avec vous"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s a partagé le fichier %s avec vous"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Télécharger"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Envoyer"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Annuler l'envoi"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Pas d'aperçu disponible pour"
diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po
index 599cfe1a8efa057ed3b0922d5c1aaf74444aa118..81cd7cf7585d34d18d4fcf6a35b5a009aa03898d 100644
--- a/l10n/fr/files_trashbin.po
+++ b/l10n/fr/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -28,42 +28,10 @@ msgstr "Impossible d'effacer %s de façon permanente"
 msgid "Couldn't restore %s"
 msgstr "Impossible de restaurer %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "effectuer l'opération de restauration"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Erreur"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "effacer définitivement le fichier"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Supprimer de façon définitive"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Nom"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Effacé"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n dossier"
-msgstr[1] "%n dossiers"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n fichier"
-msgstr[1] "%n fichiers"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "restauré"
@@ -72,11 +40,19 @@ msgstr "restauré"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Il n'y a rien ici. Votre corbeille est vide !"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Nom"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Restaurer"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Effacé"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Supprimer"
 
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 685dbd3e186874b18abe0a7f3f875b7a6e41b998..6a71ee8534642d47fdf2116160764019cfe14628 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-08 20:50+0000\n"
+"Last-Translator: ogre_sympathique <ogre.sympathique@speed.1s.fr>\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"
@@ -187,32 +187,32 @@ msgstr "annuler"
 msgid "Unable to remove user"
 msgstr "Impossible de retirer l'utilisateur"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: js/users.js:95 templates/users.php:26 templates/users.php:90
 #: templates/users.php:118
 msgid "Groups"
 msgstr "Groupes"
 
-#: js/users.js:97 templates/users.php:92 templates/users.php:130
+#: js/users.js:100 templates/users.php:92 templates/users.php:130
 msgid "Group Admin"
 msgstr "Groupe Admin"
 
-#: js/users.js:120 templates/users.php:170
+#: js/users.js:123 templates/users.php:170
 msgid "Delete"
 msgstr "Supprimer"
 
-#: js/users.js:277
+#: js/users.js:280
 msgid "add group"
 msgstr "ajouter un groupe"
 
-#: js/users.js:436
+#: js/users.js:442
 msgid "A valid username must be provided"
 msgstr "Un nom d'utilisateur valide doit être saisi"
 
-#: js/users.js:437 js/users.js:443 js/users.js:458
+#: js/users.js:443 js/users.js:449 js/users.js:464
 msgid "Error creating user"
 msgstr "Erreur lors de la création de l'utilisateur"
 
-#: js/users.js:442
+#: js/users.js:448
 msgid "A valid password must be provided"
 msgstr "Un mot de passe valide doit être saisi"
 
@@ -348,11 +348,11 @@ msgstr "Autoriser les utilisateurs à partager avec des utilisateurs de leur gro
 
 #: templates/admin.php:170
 msgid "Allow mail notification"
-msgstr ""
+msgstr "Autoriser les notifications par couriel"
 
 #: templates/admin.php:171
 msgid "Allow user to send mail notification for shared files"
-msgstr ""
+msgstr "Autoriser l'utilisateur à envoyer une notification par couriel concernant les fichiers partagés"
 
 #: templates/admin.php:178
 msgid "Security"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 679f44b182f06c76d0750ba3dc8df666e379859a..e1f284e779acf78bc14af4aed52be27e9f27958a 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-13 18:30+0000\n"
 "Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -370,14 +370,18 @@ msgid ""
 msgstr "Par défaut, l'attribut UUID est automatiquement  détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP."
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "Attribut UUID :"
+msgid "UUID Attribute for Users:"
+msgstr "Attribut UUID pour les utilisateurs :"
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr "Attribut UUID pour les groupes :"
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "Association Nom d'utilisateur-Utilisateur LDAP"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -391,18 +395,18 @@ msgid ""
 "experimental stage."
 msgstr "Les noms d'utilisateurs sont utilisés pour le stockage et l'assignation de (meta) données. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur LDAP aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs, le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. Si le DN est modifié, ces modifications seront retrouvées. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mais uniquement sur des environnements de tests et d'expérimentation."
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Supprimer l'association utilisateur interne-utilisateur LDAP"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Supprimer l'association nom de groupe-groupe LDAP"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Tester la configuration"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Aide"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 18eab0b5b89590c9589cbcda49e4de4d2d4a429d..fe5624de803ef64f6b0c2f4c6ca1daf789b44339 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 09:53+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,45 +57,6 @@ msgstr "Ficheiro da caché actualizado"
 msgid "... %d%% done ..."
 msgstr "... %d%% feito ..."
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Non se indicou o tipo de categoría"
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Sen categoría que engadir?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Esta categoría xa existe: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Non se forneceu o tipo de obxecto."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "Non se forneceu o ID %s."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Produciuse un erro ao engadir %s aos favoritos."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Non se seleccionaron categorías para eliminación."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Produciuse un erro ao eliminar %s dos favoritos."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Non forneceu ningunha imaxe ou ficheiro"
@@ -312,27 +273,6 @@ msgstr "({count} seleccionados)"
 msgid "Error loading file exists template"
 msgstr "Produciuse un erro ao cargar o modelo de ficheiro existente"
 
-#: 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 "Non se especificou o tipo de obxecto."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Erro"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Non se especificou o nome do aplicativo."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Non está instalado o ficheiro {file} que se precisa"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Compartir"
@@ -341,7 +281,12 @@ msgstr "Compartir"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Erro"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Produciuse un erro ao compartir"
 
@@ -373,7 +318,7 @@ msgstr "Compartir coa ligazón"
 msgid "Password protect"
 msgstr "Protexido con contrasinais"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Contrasinal"
 
@@ -445,30 +390,58 @@ msgstr "eliminar"
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Protexido con contrasinal"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Produciuse un erro ao retirar a data de caducidade"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Produciuse un erro ao definir a data de caducidade"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Correo enviado"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Aviso"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Non se especificou o tipo de obxecto."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Eliminar"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Engadir"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -505,7 +478,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Recibirá unha ligazón por correo para restabelecer o contrasinal"
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Nome de usuario"
 
@@ -549,7 +522,7 @@ msgstr "Persoal"
 msgid "Users"
 msgstr "Usuarios"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Aplicativos"
 
@@ -561,6 +534,34 @@ msgstr "Administración"
 msgid "Help"
 msgstr "Axuda"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Acceso denegado"
@@ -590,14 +591,6 @@ msgstr "Esta compartición caduca o %s.\n\n"
 msgid "Cheers!"
 msgstr "Saúdos!"
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Editar as categorías"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Engadir"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -687,12 +680,12 @@ msgstr "Rematar a configuración"
 msgid "Finishing …"
 msgstr "Rematado ..."
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s está dispoñíbel. Obteña máis información sobre como actualizar."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Desconectar"
 
@@ -710,19 +703,27 @@ msgstr "Se non fixo recentemente cambios de contrasinal é posíbel que a súa c
 msgid "Please change your password to secure your account again."
 msgstr "Cambie de novo o seu contrasinal para asegurar a súa conta."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr "A autenticación fracasou do lado do servidor!"
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr "Contacte co administrador."
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Perdeu o contrasinal?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "lembrar"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Conectar"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Accesos alternativos"
 
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 99b866a9ada92c6718f52ecc210389cc672986d0..95c5b5ae8c29dba29230356122b0b01edbbbd914 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 09:10+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -75,15 +75,15 @@ msgstr "Produciuse un erro ao escribir no disco"
 msgid "Not enough storage available"
 msgstr "Non hai espazo de almacenamento abondo"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr "O envío fracasou. Non foi posíbel obter información do ficheiro."
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr "O envío fracasou. Non foi posíbel atopar o ficheiro enviado"
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "O directorio é incorrecto."
 
@@ -91,36 +91,36 @@ msgstr "O directorio é incorrecto."
 msgid "Files"
 msgstr "Ficheiros"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Non é posíbel enviar {filename}, xa que ou é un directorio ou ten 0 bytes"
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "O espazo dispoñíbel é insuficiente"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Envío cancelado."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr "Non foi posíbel obter o resultado do servidor."
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "O URL non pode quedar baleiro."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Nome de cartafol incorrecto. O uso de «Compartido» e «Shared» está reservado para o ownClod"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Erro"
 
@@ -132,7 +132,7 @@ msgstr "Compartir"
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Renomear"
 
@@ -164,13 +164,13 @@ msgstr "substituír {new_name} por {old_name}"
 msgid "undo"
 msgstr "desfacer"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n cartafol"
 msgstr[1] "%n cartafoles"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n ficheiro"
@@ -227,25 +227,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "O cifrado foi desactivado, mais os ficheiros están cifrados. Vaia á configuración persoal para descifrar os ficheiros."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "Produciuse un erro ao mover o ficheiro"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Modificado"
 
@@ -254,7 +254,7 @@ msgstr "Modificado"
 msgid "%s could not be renamed"
 msgstr "%s non pode cambiar de nome"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Enviar"
 
@@ -290,65 +290,65 @@ msgstr "Tamaño máximo de descarga para os ficheiros ZIP"
 msgid "Save"
 msgstr "Gardar"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Novo"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Ficheiro de texto"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Cartafol"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Desde a ligazón"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Ficheiros eliminados"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Cancelar o envío"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Non ten permisos para escribir aquí."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Aquí non hai nada. Envíe algo."
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Deixar de compartir"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Envío demasiado grande"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor"
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Estanse analizando os ficheiros. Agarde."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Análise actual"
 
diff --git a/l10n/gl/files_encryption.po b/l10n/gl/files_encryption.po
index 374e363bfa2fd8e45db0002ef37cea0945d45e17..525dff09f7856d58a0dcc1601230e6dff4f15885 100644
--- a/l10n/gl/files_encryption.po
+++ b/l10n/gl/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -56,14 +56,14 @@ msgid ""
 "correct."
 msgstr "Non foi posíbel actualizar o contrasinal da chave privada. É probábel que o contrasinal antigo non sexa correcto."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
-msgstr ""
+msgstr "Non se iniciou o aplicativo de cifrado! Quizais volva a activarse durante a sesión. Tente pechar a sesión e volver iniciala que tamén se inicie o aplicativo de cifrado."
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -71,6 +71,18 @@ msgid ""
 "files."
 msgstr "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior (p.ex. o seu directorio corporativo). Vostede pode actualizar o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros"
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "Non se cumpren os requisitos."
@@ -82,7 +94,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Asegúrese de que está instalado o PHP 5.3.3 ou posterior e de o OpenSSL xunto coa extensión PHP estean activados e configurados correctamente. Polo de agora foi desactivado o aplicativo de cifrado."
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "Os seguintes usuarios non teñen configuración para o cifrado:"
 
@@ -92,97 +104,97 @@ msgstr "Gardando..."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
-msgstr ""
+msgstr "Vaia directamente ao seu"
 
 #: templates/invalid_private_key.php:8
 msgid "personal settings"
 msgstr "axustes persoais"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Activar a chave de recuperación (permitirá recuperar os ficheiros dos usuarios no caso de perda do contrasinal):"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "Contrasinal da chave de recuperación"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
-msgstr ""
+msgstr "Repita o contrasinal da chave da recuperación"
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Activado"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "Cambiar o contrasinal da chave de la recuperación:"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "Antigo contrasinal da chave de recuperación"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "Novo contrasinal da chave de recuperación"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
-msgstr ""
+msgstr "Repita o novo contrasinal da chave da recuperación"
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Cambiar o contrasinal"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "O seu contrasinal da chave privada non coincide co seu contrasinal de acceso."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "Estabeleza o seu contrasinal antigo da chave de recuperación ao seu contrasinal de acceso actual"
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr " Se non lembra o seu antigo contrasinal pode pedírllelo ao seu administrador para recuperar os seus ficheiros."
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Contrasinal de acceso antigo"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Contrasinal de acceso actual"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "Actualizar o contrasinal da chave privada"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Activar o  contrasinal de recuperación:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Ao activar esta opción permitiráselle volver a obter acceso aos ficheiros cifrados no caso de perda do contrasinal"
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "Actualizouse o ficheiro de axustes de recuperación"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "Non foi posíbel actualizar o ficheiro de recuperación"
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index bd0b79c5d8bec456428c4b8a08fc081eecb7983f..3cbab9325b0ea07ee2ea63cb244bb5d1ed07eb1b 100644
--- a/l10n/gl/files_sharing.po
+++ b/l10n/gl/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 09:20+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr "Esta compartición está protexida con contrasinal"
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "O contrasinal é incorrecto. Ténteo de novo."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Contrasinal"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Enviar"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Semella que esta ligazón non funciona."
@@ -54,28 +54,28 @@ msgstr "foi desactivada a compartición"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Para obter máis información, pregúntelle á persoa que lle enviou a ligazón."
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s compartiu o cartafol %s con vostede"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s compartiu o ficheiro %s con vostede"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Enviar"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Cancelar o envío"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Sen vista previa dispoñíbel para"
diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po
index 7250668c4f00f774183aa49cd430a09e91b013d2..a17a5e913ae25b937e3110372a2e80a14f219298 100644
--- a/l10n/gl/files_trashbin.po
+++ b/l10n/gl/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,42 +28,10 @@ msgstr "Non foi posíbel eliminar %s permanente"
 msgid "Couldn't restore %s"
 msgstr "Non foi posíbel restaurar %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "realizar a operación de restauración"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Erro"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "eliminar o ficheiro permanentemente"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Eliminar permanentemente"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Nome"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Eliminado"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n cartafol"
-msgstr[1] "%n cartafoles"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n ficheiro"
-msgstr[1] "%n ficheiros"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "restaurado"
@@ -72,11 +40,19 @@ msgstr "restaurado"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Aquí non hai nada. O cesto do lixo está baleiro!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Nome"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Restablecer"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Eliminado"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Eliminar"
 
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 7806b1d62c197f849e3fafccfc2793f022628952..0ac3ec78093f43bea09fddb232de5baa2ebd1e04 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 09:36+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -369,14 +369,18 @@ msgid ""
 msgstr "De xeito predeterminado, o atributo UUID é detectado automaticamente. O atributo UUID utilizase para identificar, sen dúbida, aos usuarios e grupos LDAP. Ademais, crearase o usuario interno baseado no UUID, se non se especifica anteriormente o contrario. Pode anular a configuración e pasar un atributo da súa escolla. Vostede debe asegurarse de que o atributo da súa escolla pode ser recuperado polos usuarios e grupos e de que é único. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP."
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "Atributo do UUID:"
+msgid "UUID Attribute for Users:"
+msgstr "Atributo do UUID para usuarios:"
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr "Atributo do UUID para grupos:"
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "Asignación do usuario ao «nome de usuario LDAP»"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -390,18 +394,18 @@ msgid ""
 "experimental stage."
 msgstr "Os nomes de usuario empreganse para almacenar e asignar (meta) datos. Coa fin de identificar con precisión e recoñecer aos usuarios, cada usuario LDAP terá un nome de usuario interno. Isto require unha asignación de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na caché, para así reducir a interacción do LDAP, mais non se utiliza para a identificación. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignacións deixará rastros en todas partes. A limpeza das asignacións non é sensíbel á configuración, afecta a todas as configuracións de LDAP! Non limpar nunca as asignacións nun entorno de produción. Limpar as asignacións só en fases de proba ou experimentais."
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Limpar a asignación do usuario ao «nome de usuario LDAP»"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Limpar a asignación do grupo ao «nome de grupo LDAP»"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Probar a configuración"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Axuda"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index dac10ff78fcd17c5d8cc7f0b68971b3f8ea18553..cc4b7098229e69f2934ae56438b7217d3e9b69e5 100644
--- a/l10n/he/core.po
+++ b/l10n/he/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -58,45 +58,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 "הקטגוריה הבאה כבר קיימת: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "סוג הפריט לא סופק."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "מזהה %s לא סופק."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "אירעה שגיאה בעת הוספת %s למועדפים."
-
-#: 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 "שגיאה בהסרת %s מהמועדפים."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -313,27 +274,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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 "הקובץ הנדרש {file} אינו מותקן!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "שותף"
@@ -342,7 +282,12 @@ msgstr "שותף"
 msgid "Share"
 msgstr "שתף"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "שגיאה"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "שגיאה במהלך השיתוף"
 
@@ -374,7 +319,7 @@ msgstr "שיתוף עם קישור"
 msgid "Password protect"
 msgstr "הגנה בססמה"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "סיסמא"
 
@@ -446,30 +391,58 @@ msgstr "מחיקה"
 msgid "share"
 msgstr "שיתוף"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "מוגן בססמה"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "אירעה שגיאה בביטול תאריך התפוגה"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "אירעה שגיאה בעת הגדרת תאריך התפוגה"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "מתבצעת שליחה ..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "הודעת הדוא״ל נשלחה"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "אזהרה"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "סוג הפריט לא צוין."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "מחיקה"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "הוספה"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -506,7 +479,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "שם משתמש"
 
@@ -550,7 +523,7 @@ msgstr "אישי"
 msgid "Users"
 msgstr "משתמשים"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "יישומים"
 
@@ -562,6 +535,34 @@ msgstr "מנהל"
 msgid "Help"
 msgstr "עזרה"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "הגישה נחסמה"
@@ -591,14 +592,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "ערוך קטגוריות"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "הוספה"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -688,12 +681,12 @@ msgstr "סיום התקנה"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s זמינה להורדה. ניתן ללחוץ כדי לקבל מידע נוסף כיצד לעדכן."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "התנתקות"
 
@@ -711,19 +704,27 @@ msgstr "אם לא שינית את ססמתך לאחרונה, יתכן שחשבו
 msgid "Please change your password to secure your account again."
 msgstr "נא לשנות את הססמה שלך כדי לאבטח את חשבונך מחדש."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "שכחת את ססמתך?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "שמירת הססמה"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "כניסה"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "כניסות אלטרנטיביות"
 
diff --git a/l10n/he/files.po b/l10n/he/files.po
index d37f03036acc5c34de44187e6942ea749f1743f6..6a31c8be016a27ed156c0a50af40a5927419077e 100644
--- a/l10n/he/files.po
+++ b/l10n/he/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -75,15 +75,15 @@ msgstr "הכתיבה לכונן נכשלה"
 msgid "Not enough storage available"
 msgstr "אין די שטח פנוי באחסון"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "תיקייה שגויה."
 
@@ -91,36 +91,36 @@ msgstr "תיקייה שגויה."
 msgid "Files"
 msgstr "קבצים"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr ""
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "ההעלאה בוטלה."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "קישור אינו יכול להיות ריק."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "שגיאה"
 
@@ -132,7 +132,7 @@ msgstr "שתף"
 msgid "Delete permanently"
 msgstr "מחק לצמיתות"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "שינוי שם"
 
@@ -164,13 +164,13 @@ msgstr "{new_name} הוחלף ב־{old_name}"
 msgid "undo"
 msgstr "ביטול"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -227,25 +227,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "שם"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "גודל"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "זמן שינוי"
 
@@ -254,7 +254,7 @@ msgstr "זמן שינוי"
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "העלאה"
 
@@ -290,65 +290,65 @@ msgstr "גודל הקלט המרבי לקובצי ZIP"
 msgid "Save"
 msgstr "שמירה"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "חדש"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "קובץ טקסט"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "תיקייה"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "מקישור"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "ביטול ההעלאה"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "אין כאן שום דבר. אולי ברצונך להעלות משהו?"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "הורדה"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "הסר שיתוף"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "מחיקה"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "העלאה גדולה מידי"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "הקבצים נסרקים, נא להמתין."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "הסריקה הנוכחית"
 
diff --git a/l10n/he/files_encryption.po b/l10n/he/files_encryption.po
index a113b684cf892296c405e72cfad911e07cd290bd..92e019a052c4c6eab60698a27a3c2743330cb410 100644
--- a/l10n/he/files_encryption.po
+++ b/l10n/he/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "הצפנה"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index c181aa3c1eeef2b0c1ec4634d57c8920c9dcbec0..fcf68d795ff2b5f2d7d31743f58da616401e9219 100644
--- a/l10n/he/files_sharing.po
+++ b/l10n/he/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -18,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "סיסמא"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "שליחה"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s שיתף עמך את התיקייה %s"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s שיתף עמך את הקובץ %s"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "הורדה"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "העלאה"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "ביטול ההעלאה"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "אין תצוגה מקדימה זמינה עבור"
diff --git a/l10n/he/files_trashbin.po b/l10n/he/files_trashbin.po
index ebdf6f415076bba56dbf9ca9ba3777a370eed115..6a48277fc214496946ecdd84479c1a4d357fd71b 100644
--- a/l10n/he/files_trashbin.po
+++ b/l10n/he/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -28,42 +28,10 @@ msgstr "לא ניתן למחוק את %s לצמיתות"
 msgid "Couldn't restore %s"
 msgstr "לא ניתן לשחזר את %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "ביצוע פעולת שחזור"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "שגיאה"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "מחיקת קובץ לצמיתות"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "מחיקה לצמיתות"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "שם"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "נמחק"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -72,11 +40,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "אין כאן שום דבר. סל המיחזור שלך ריק!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "שם"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "שחזור"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "נמחק"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "מחיקה"
 
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index 00811e8330d67815063b34c301139faeeca3a42b..0c58cc77efe8406a67c555272b4cd80895feff2c 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -369,14 +369,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -390,18 +394,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "עזרה"
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index 59475bde13661cbf0046c79e6f19ae6ee914cf39..ec57238c9cdeca98a6a2b8495adfc7a94794c3e6 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -58,45 +58,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 "यह कैटेगरी पहले से ही मौजूद है: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "ऑब्जेक्ट प्रकार नहीं दिया हुआ"
-
-#: 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -313,27 +274,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -342,7 +282,12 @@ msgstr ""
 msgid "Share"
 msgstr "साझा करें"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "त्रुटि"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -374,7 +319,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "पासवर्ड"
 
@@ -446,30 +391,58 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "भेजा जा रहा है"
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "ईमेल भेज दिया गया है "
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "चेतावनी "
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "डाले"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -506,7 +479,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|"
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "प्रयोक्ता का नाम"
 
@@ -550,7 +523,7 @@ msgstr "यक्तिगत"
 msgid "Users"
 msgstr "उपयोगकर्ता"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Apps"
 
@@ -562,6 +535,34 @@ msgstr ""
 msgid "Help"
 msgstr "सहयोग"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -591,14 +592,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "डाले"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -688,12 +681,12 @@ msgstr "सेटअप समाप्त करे"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "लोग  आउट"
 
@@ -711,19 +704,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "याद रखें"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/hi/files_encryption.po b/l10n/hi/files_encryption.po
index 30e76f8feba2aa804224d00951d14e0b6c83c7b6..a1640c0442951e40408489faedc83d8103e8e371 100644
--- a/l10n/hi/files_encryption.po
+++ b/l10n/hi/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po
index 546e758e1c79ce0c9a079ed67e4241c624feb618..327920b444ec881ff1a771d0f600f5ae19f2ba75 100644
--- a/l10n/hi/files_sharing.po
+++ b/l10n/hi/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-09-18 11:47-0400\n"
-"PO-Revision-Date: 2013-09-17 13:14+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -18,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "पासवर्ड"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr ""
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "अपलोड "
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/hi/files_trashbin.po b/l10n/hi/files_trashbin.po
index a67189f46b8560c36e12ae2e0634556e669be613..64da02cb00e0d1260ed8911c7df8675e4312ff5d 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -27,42 +27,10 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "त्रुटि"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr ""
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr ""
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -71,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr ""
 
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index 132e022bcfd5179f8e676107f9c3c73b11d12a51..6bfd82488cfa20e93c742350f6e245fc61c5369d 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "सहयोग"
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index aa8847b3dc8cc213cfeaa7066ad24959c06f7bbc..30fe43a599fd2ad774acfff1993e4f170bb8f456 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 "Nemate kategorija koje možete dodati?"
-
-#: 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 "Niti jedna kategorija nije odabrana za brisanje."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -316,27 +277,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Greška"
-
-#: 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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -345,7 +285,12 @@ msgstr ""
 msgid "Share"
 msgstr "Podijeli"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Greška"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Greška prilikom djeljenja"
 
@@ -377,7 +322,7 @@ msgstr "Djeli preko link-a"
 msgid "Password protect"
 msgstr "Zaštiti lozinkom"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Lozinka"
 
@@ -449,30 +394,58 @@ msgstr "izbriši"
 msgid "share"
 msgstr "djeli"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Zaštita lozinkom"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Greška prilikom brisanja datuma isteka"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Greška prilikom postavljanja datuma isteka"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Obriši"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Dodaj"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -509,7 +482,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Primit ćete link kako biste poništili zaporku putem e-maila."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Korisničko ime"
 
@@ -553,7 +526,7 @@ msgstr "Osobno"
 msgid "Users"
 msgstr "Korisnici"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Aplikacije"
 
@@ -565,6 +538,34 @@ msgstr "Administrator"
 msgid "Help"
 msgstr "Pomoć"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Pristup zabranjen"
@@ -594,14 +595,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Uredi kategorije"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Dodaj"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -691,12 +684,12 @@ msgstr "Završi postavljanje"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Odjava"
 
@@ -714,19 +707,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Izgubili ste lozinku?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "zapamtiti"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Prijava"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index 039422202dad1b40dbd0050997e7c8d7efad9424..21231977777cf4d207fea60bd4da061296063cb4 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -74,15 +74,15 @@ msgstr "Neuspjelo pisanje na disk"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr ""
 
@@ -90,36 +90,36 @@ msgstr ""
 msgid "Files"
 msgstr "Datoteke"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr ""
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Slanje poništeno."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Greška"
 
@@ -131,7 +131,7 @@ msgstr "Podijeli"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Promjeni ime"
 
@@ -163,14 +163,14 @@ msgstr ""
 msgid "undo"
 msgstr "vrati"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -229,25 +229,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Zadnja promjena"
 
@@ -256,7 +256,7 @@ msgstr "Zadnja promjena"
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Učitaj"
 
@@ -292,65 +292,65 @@ msgstr "Maksimalna veličina za ZIP datoteke"
 msgid "Save"
 msgstr "Snimi"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "novo"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "tekstualna datoteka"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "mapa"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Prekini upload"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Nema ničega u ovoj mapi. Pošalji nešto!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Preuzimanje"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Makni djeljenje"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Prijenos je preobiman"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Datoteke se skeniraju, molimo pričekajte."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Trenutno skeniranje"
 
diff --git a/l10n/hr/files_encryption.po b/l10n/hr/files_encryption.po
index 12a6998030e628c9577112160dd37c36365624b5..c127b7e28a515f81364f07e9bc758ecea567c354 100644
--- a/l10n/hr/files_encryption.po
+++ b/l10n/hr/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index 308e9e9875577f4c756aa2ffc2cce487896b3a45..ba1345eed1f743bb46d7f9178dd6da4a760fa445 100644
--- a/l10n/hr/files_sharing.po
+++ b/l10n/hr/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -18,17 +18,17 @@ msgstr ""
 "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"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Pošalji"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Preuzimanje"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Učitaj"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Prekini upload"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/hr/files_trashbin.po b/l10n/hr/files_trashbin.po
index 09cacae10df4d9869bc1437a648e75033600abf7..ce968dadfccb303e31ec8c7474be3e1ee697614c 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,10 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Greška"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr ""
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Ime"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -73,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Ime"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Obriši"
 
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index f46f868f8d3a966f2404ae07096d874ee293bbba..196fcf86bc9bd53fbaf55b822496648ea172b698 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Pomoć"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 0d7f2e2f31708a8addeb7a39b3469e2ff161c877..ead92d79da036544fdad2fe78db3f4356ee45064 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -58,45 +58,6 @@ msgstr "Filecache frissítve"
 msgid "... %d%% done ..."
 msgstr "... %d%% kész ..."
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Nincs megadva a kategória típusa."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Nincs hozzáadandó kategória?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Ez a kategória már létezik: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Az objektum típusa nincs megadva."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID nincs megadva."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Nem sikerült a kedvencekhez adni ezt: %s"
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Nincs törlésre jelölt kategória"
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Nem sikerült a kedvencekből törölni ezt: %s"
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Nincs kép vagy file megadva"
@@ -313,27 +274,6 @@ msgstr "({count} kiválasztva)"
 msgid "Error loading file exists template"
 msgstr "Hiba a létező sablon betöltésekor"
 
-#: 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 "Az objektum típusa nincs megadva."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Hiba"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Az alkalmazás neve nincs megadva."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "A szükséges fájl: {file} nincs telepítve!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Megosztott"
@@ -342,7 +282,12 @@ msgstr "Megosztott"
 msgid "Share"
 msgstr "Megosztás"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Hiba"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Nem sikerült létrehozni a megosztást"
 
@@ -374,7 +319,7 @@ msgstr "Link megadásával osztom meg"
 msgid "Password protect"
 msgstr "Jelszóval is védem"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Jelszó"
 
@@ -446,30 +391,58 @@ msgstr "töröl"
 msgid "share"
 msgstr "megoszt"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Jelszóval van védve"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Nem sikerült a lejárati időt törölni"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Nem sikerült a lejárati időt beállítani"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Küldés ..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Az emailt elküldtük"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Az objektum típusa nincs megadva."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Törlés"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Hozzáadás"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -506,7 +479,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Egy emailben fog értesítést kapni a jelszóbeállítás módjáról."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Felhasználónév"
 
@@ -550,7 +523,7 @@ msgstr "Személyes"
 msgid "Users"
 msgstr "Felhasználók"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Alkalmazások"
 
@@ -562,6 +535,34 @@ msgstr "Adminsztráció"
 msgid "Help"
 msgstr "Súgó"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "A hozzáférés nem engedélyezett"
@@ -591,14 +592,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Kategóriák szerkesztése"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Hozzáadás"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -688,12 +681,12 @@ msgstr "A beállítások befejezése"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s rendelkezésre áll. További információ a frissítéshez."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Kilépés"
 
@@ -711,19 +704,27 @@ msgstr "Ha mostanában nem módosította a jelszavát, akkor lehetséges, hogy i
 msgid "Please change your password to secure your account again."
 msgstr "A biztonsága érdekében változtassa meg a jelszavát!"
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Elfelejtette a jelszavát?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "emlékezzen"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Bejelentkezés"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Alternatív bejelentkezés"
 
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index 78fb764ef2f7818ef1c5daccb25b75fdc16cf69f..b39ee24c24400ec69349f67b83dcfeea5cb6c369 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -75,15 +75,15 @@ msgstr "Nem sikerült a lemezre történő írás"
 msgid "Not enough storage available"
 msgstr "Nincs elég szabad hely."
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr "A feltöltés nem sikerült. Az állományt leíró információk nem érhetők el."
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr "A feltöltés nem sikerült. Nem található a feltöltendő állomány."
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Érvénytelen mappa."
 
@@ -91,36 +91,36 @@ msgstr "Érvénytelen mappa."
 msgid "Files"
 msgstr "Fájlok"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "A(z) {filename} állomány nem tölthető fel, mert ez vagy egy mappa, vagy pedig 0 bájtból áll."
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Nincs elég szabad hely"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "A feltöltést megszakítottuk."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr "A kiszolgálótól nem kapható meg az eredmény."
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "Az URL nem lehet semmi."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Hiba"
 
@@ -132,7 +132,7 @@ msgstr "Megosztás"
 msgid "Delete permanently"
 msgstr "Végleges törlés"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Átnevezés"
 
@@ -164,13 +164,13 @@ msgstr "{new_name} fájlt kicseréltük ezzel:  {old_name}"
 msgid "undo"
 msgstr "visszavonás"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mappa"
 msgstr[1] "%n mappa"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n állomány"
@@ -227,25 +227,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "A titkosítási funkciót kikapcsolták, de az Ön állományai még mindig titkosított állapotban vannak. A személyes beállításoknál tudja a titkosítást feloldani."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "Az állomány áthelyezése nem sikerült."
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Név"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Méret"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Módosítva"
 
@@ -254,7 +254,7 @@ msgstr "Módosítva"
 msgid "%s could not be renamed"
 msgstr "%s átnevezése nem sikerült"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Feltöltés"
 
@@ -290,65 +290,65 @@ msgstr "ZIP-fájlok maximális kiindulási mérete"
 msgid "Save"
 msgstr "Mentés"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Új"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Szövegfájl"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Mappa"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Feltöltés linkről"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Törölt fájlok"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "A feltöltés megszakítása"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Itt nincs írásjoga."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Itt nincs semmi. Töltsön fel valamit!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Letöltés"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "A megosztás visszavonása"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Törlés"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "A feltöltés túl nagy"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "A fájllista ellenőrzése zajlik, kis türelmet!"
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Ellenőrzés alatt"
 
diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po
index a2a1a319f83f63ab52ad772e5a502bfb455fe508..b2c6f48b025c41a64c256d39f074be4047e0554e 100644
--- a/l10n/hu_HU/files_encryption.po
+++ b/l10n/hu_HU/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -54,14 +54,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -69,6 +69,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -80,7 +92,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Kérlek győződj meg arról, hogy PHP 5.3.3 vagy annál frissebb van telepítve, valamint a PHP-hez tartozó OpenSSL bővítmény be van-e kapcsolva és az helyesen van-e konfigurálva! Ki lett kapcsolva ideiglenesen a titkosító alkalmazás."
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -96,91 +108,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "személyes beállítások"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Titkosítás"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Bekapcsolva"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Kikapcsolva"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Jelszó megváltoztatása"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Régi bejelentkezési jelszó"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Jelenlegi bejelentkezési jelszó"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "Privát kulcs jelszó frissítése"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Jelszó-visszaállítás bekapcsolása"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index ae03dc98f23c6b6958875aef42c3e228564c9618..696a897c9b974fdc59f47ade34685956f8117e4a 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/files_sharing.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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "A megadott jelszó nem megfelelő. Próbálja újra!"
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Jelszó"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Elküld"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Sajnos úgy tűnik, ez a link már nem működik."
@@ -54,28 +54,28 @@ msgstr "letiltásra került a megosztás"
 msgid "For more info, please ask the person who sent this link."
 msgstr "További információért forduljon ahhoz, aki ezt a linket küldte Önnek!"
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s megosztotta Önnel ezt a mappát: %s"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s megosztotta Önnel ezt az állományt: %s"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Letöltés"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Feltöltés"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "A feltöltés megszakítása"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Nem áll rendelkezésre előnézet ehhez: "
diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po
index c669e0e0262b0d49aa6576b67e5995cefe826560..4ebe1a9808590e97ded4215b0af1936a5d96cd2d 100644
--- a/l10n/hu_HU/files_trashbin.po
+++ b/l10n/hu_HU/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -28,42 +28,10 @@ msgstr "Nem sikerült %s végleges törlése"
 msgid "Couldn't restore %s"
 msgstr "Nem sikerült %s visszaállítása"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "a visszaállítás végrehajtása"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Hiba"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "az állomány végleges törlése"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Végleges törlés"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Név"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Törölve"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] "%n mappa"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] "%n állomány"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "visszaállítva"
@@ -72,11 +40,19 @@ msgstr "visszaállítva"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Itt nincs semmi. Az Ön szemetes mappája üres!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Név"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Visszaállítás"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Törölve"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Törlés"
 
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index 28f251846813b948dd869c30c2b52f6a0a2574c0..ccb187664daaf1931a2dd6270757a31b98324e5c 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: ebela <bela@dandre.hu>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -370,14 +370,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "UUID attribútum:"
+msgid "UUID Attribute for Users:"
+msgstr ""
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "Felhasználó - LDAP felhasználó hozzárendelés"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -391,18 +395,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "A felhasználó - LDAP felhasználó hozzárendelés törlése"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "A csoport - LDAP csoport hozzárendelés törlése"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "A beállítások tesztelése"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Súgó"
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index ae3dea63e17bffa4f754678d4d3740b3fce96b35..523a1d3e3e025a56bca84e0125abe12ba1646ace 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -311,27 +272,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -340,7 +280,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr ""
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -372,7 +317,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr ""
 
@@ -444,30 +389,58 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Ջնջել"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -504,7 +477,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr ""
 
@@ -548,7 +521,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr ""
 
@@ -560,6 +533,34 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -589,14 +590,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr ""
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -686,12 +679,12 @@ msgstr ""
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr ""
 
@@ -709,19 +702,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/hy/files_encryption.po b/l10n/hy/files_encryption.po
index 60b4e5ae2b39e13f5be0dd872feb23244759ee94..cb10f0389c597cf3701228ee7ae3327bbe27b985 100644
--- a/l10n/hy/files_encryption.po
+++ b/l10n/hy/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index bdb47a3fbc9b4c95639c0af54770e2067d4f8ddb..d920785be63a51ddb66755735f380fc2f0f9678e 100644
--- a/l10n/hy/files_sharing.po
+++ b/l10n/hy/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -18,16 +18,16 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
-msgid "Password"
+msgid "The password is wrong. Try again."
 msgstr ""
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Հաստատել"
+#: templates/authenticate.php:10
+msgid "Password"
+msgstr ""
 
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Բեռնել"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:85
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/hy/files_trashbin.po b/l10n/hy/files_trashbin.po
index b86cee6006895b3f3ff3f13ffadb2cfb5fd33ce4..d129300c0e52aaa95c57e56334262ccf42ab3814 100644
--- a/l10n/hy/files_trashbin.po
+++ b/l10n/hy/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-01 18:38+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -27,42 +27,10 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr ""
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr ""
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -71,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Ջնջել"
 
diff --git a/l10n/hy/user_ldap.po b/l10n/hy/user_ldap.po
index 8b2b904fe7f6c7bd3d2a2cd204b41d7969263a1a..d0f033e8f2f8cec296798a3fcf293b476eb21bcd 100644
--- a/l10n/hy/user_ldap.po
+++ b/l10n/hy/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:36
+#: ajax/testConfiguration.php:37
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:39
+#: ajax/testConfiguration.php:40
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:43
+#: ajax/testConfiguration.php:44
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 0a5eb1c9f7ef112619fc5abdd4f845b9b3cf1946..a8a0950fcdcac413d80918c398c41d49c7249acc 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -311,27 +272,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Error"
-
-#: 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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -340,7 +280,12 @@ msgstr ""
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Error"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -372,7 +317,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Contrasigno"
 
@@ -444,30 +389,58 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Deler"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Adder"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -504,7 +477,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Nomine de usator"
 
@@ -548,7 +521,7 @@ msgstr "Personal"
 msgid "Users"
 msgstr "Usatores"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Applicationes"
 
@@ -560,6 +533,34 @@ msgstr "Administration"
 msgid "Help"
 msgstr "Adjuta"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Accesso prohibite"
@@ -589,14 +590,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Modificar categorias"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Adder"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -686,12 +679,12 @@ msgstr ""
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Clauder le session"
 
@@ -709,19 +702,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Tu perdeva le contrasigno?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "memora"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Aperir session"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 8a79152c0bffa9aa718efe5e3acff73e1c3e322a..e65025f0af89e371efbbf229fcf784b38c6cfc57 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -74,15 +74,15 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr ""
 
@@ -90,36 +90,36 @@ msgstr ""
 msgid "Files"
 msgstr "Files"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr ""
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Error"
 
@@ -131,7 +131,7 @@ msgstr "Compartir"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr ""
 
@@ -163,13 +163,13 @@ msgstr ""
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -226,25 +226,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Nomine"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Dimension"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Modificate"
 
@@ -253,7 +253,7 @@ msgstr "Modificate"
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Incargar"
 
@@ -289,65 +289,65 @@ msgstr ""
 msgid "Save"
 msgstr "Salveguardar"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nove"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "File de texto"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Dossier"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Nihil hic. Incarga alcun cosa!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Discargar"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Deler"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Incargamento troppo longe"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/ia/files_encryption.po b/l10n/ia/files_encryption.po
index d74401d383090528066a3ae90379f303b5e58eaf..9fbb91e732e0effbbfd170fd32e4685c3b93c04f 100644
--- a/l10n/ia/files_encryption.po
+++ b/l10n/ia/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index 83dfe3acf59faeff12865047ce6c5a6847b6a655..e3d9c8b0efe016a0970b5716085ac6abb6ad478a 100644
--- a/l10n/ia/files_sharing.po
+++ b/l10n/ia/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -18,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Contrasigno"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Submitter"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Discargar"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Incargar"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/ia/files_trashbin.po b/l10n/ia/files_trashbin.po
index 41a8965d2d4fda7c53111709bdf06363d4814570..807fa0a9311c7dfda5535bfaf5ea728291fdea85 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -27,42 +27,10 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Error"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr ""
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Nomine"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -71,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Nomine"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Deler"
 
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index c9c4e81d410cbc23a2aad9cb076f43563134f654..b7150a9f1f9fa85d52095ca08c025c8088209fd8 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Adjuta"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 6343b369f755f200bfb31ab86d257f3cf71b2bc2..dc94539579d88f7b28dd19e502ec8dbfc9994fac 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 msgstr ""
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Tipe kategori tidak diberikan."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Tidak ada kategori yang akan ditambahkan?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Kategori ini sudah ada: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Tipe objek tidak diberikan."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "ID %s tidak diberikan."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Galat ketika menambah %s ke favorit"
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Tidak ada kategori terpilih untuk dihapus."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Galat ketika menghapus %s dari favorit"
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -306,27 +267,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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 "Tipe objek tidak ditentukan."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Galat"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Nama aplikasi tidak ditentukan."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Berkas {file} yang dibutuhkan tidak terpasang!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Dibagikan"
@@ -335,7 +275,12 @@ msgstr "Dibagikan"
 msgid "Share"
 msgstr "Bagikan"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Galat"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Galat ketika membagikan"
 
@@ -367,7 +312,7 @@ msgstr "Bagikan lewat tautan"
 msgid "Password protect"
 msgstr "Lindungi dengan sandi"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Sandi"
 
@@ -439,30 +384,58 @@ msgstr "hapus"
 msgid "share"
 msgstr "bagikan"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Dilindungi sandi"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Galat ketika menghapus tanggal kedaluwarsa"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Galat ketika menyetel tanggal kedaluwarsa"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Mengirim ..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Email terkirim"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Peringatan"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Tipe objek tidak ditentukan."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Hapus"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Tambah"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -499,7 +472,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Anda akan menerima tautan penyetelan ulang sandi lewat Email."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Nama pengguna"
 
@@ -543,7 +516,7 @@ msgstr "Pribadi"
 msgid "Users"
 msgstr "Pengguna"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Aplikasi"
 
@@ -555,6 +528,34 @@ msgstr "Admin"
 msgid "Help"
 msgstr "Bantuan"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Akses ditolak"
@@ -584,14 +585,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Edit kategori"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Tambah"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -681,12 +674,12 @@ msgstr "Selesaikan instalasi"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Keluar"
 
@@ -704,19 +697,27 @@ msgstr "Jika tidak pernah mengubah sandi Anda baru-baru ini, akun Anda mungkin d
 msgid "Please change your password to secure your account again."
 msgstr "Mohon ubah sandi Anda untuk mengamankan kembali akun Anda."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Lupa sandi?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "selalu masuk"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Masuk"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Cara Alternatif untuk Masuk"
 
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 10376eabb132dbf575c0456a0b9e96815a26fc4d..17c205652b1fb237c6c9d8aea4325d035e92d44f 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -74,15 +74,15 @@ msgstr "Gagal menulis ke disk"
 msgid "Not enough storage available"
 msgstr "Ruang penyimpanan tidak mencukupi"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Direktori tidak valid."
 
@@ -90,36 +90,36 @@ msgstr "Direktori tidak valid."
 msgid "Files"
 msgstr "Berkas"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Ruang penyimpanan tidak mencukupi"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Pengunggahan dibatalkan."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL tidak boleh kosong"
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Galat"
 
@@ -131,7 +131,7 @@ msgstr "Bagikan"
 msgid "Delete permanently"
 msgstr "Hapus secara permanen"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Ubah nama"
 
@@ -163,12 +163,12 @@ msgstr "mengganti {new_name} dengan {old_name}"
 msgid "undo"
 msgstr "urungkan"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -223,25 +223,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Ukuran"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Dimodifikasi"
 
@@ -250,7 +250,7 @@ msgstr "Dimodifikasi"
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Unggah"
 
@@ -286,65 +286,65 @@ msgstr "Ukuran masukan maksimum untuk berkas ZIP"
 msgid "Save"
 msgstr "Simpan"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Baru"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Berkas teks"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Folder"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Dari tautan"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Berkas yang dihapus"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Batal pengunggahan"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Anda tidak memiliki izin menulis di sini."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Tidak ada apa-apa di sini. Unggah sesuatu!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Unduh"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Batalkan berbagi"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Hapus"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Yang diunggah terlalu besar"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Berkas sedang dipindai, silakan tunggu."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Yang sedang dipindai"
 
diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po
index 62ec821102c5eab78d5326a6eaed2ef91a08b68b..3ab56b93decad7336e7298bb5a67133ef95685fa 100644
--- a/l10n/id/files_encryption.po
+++ b/l10n/id/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Enkripsi"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index 2daa40bb0cab06198d245c02d783d6f528a0c3d6..04c5fe53ae1c801480961be764fe61003225cb9a 100644
--- a/l10n/id/files_sharing.po
+++ b/l10n/id/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 17:20+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Sandi"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Kirim"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s membagikan folder %s dengan Anda"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s membagikan file %s dengan Anda"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Unduh"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Unggah"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Batal pengunggahan"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Tidak ada pratinjau tersedia untuk"
diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po
index 7e2100097612c458aae26f8d48a62f0d3ab38e91..2e8b106cdd9df03fc14ab00f0740b55495a2fbb5 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -27,40 +27,10 @@ msgstr "Tidak dapat menghapus permanen %s"
 msgid "Couldn't restore %s"
 msgstr "Tidak dapat memulihkan %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "jalankan operasi pemulihan"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Galat"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "hapus berkas secara permanen"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Hapus secara permanen"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Nama"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Dihapus"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -69,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Tempat sampah anda kosong!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Nama"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Pulihkan"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Dihapus"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Hapus"
 
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index 3e22306396c5209c2664b948863428e34225bfe2..b965f5e73df25e5c2a2f0cc344192c6ad103182a 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Uji Konfigurasi"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Bantuan"
diff --git a/l10n/is/core.po b/l10n/is/core.po
index fdce8a6797a7b3a5c106e114c6d981a7083e97e7..cc5105d49d9a7d2c4cdfcb9812b7255f1b7d2bf9 100644
--- a/l10n/is/core.po
+++ b/l10n/is/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -57,45 +57,6 @@ msgstr ""
 msgid "... %d%% done ..."
 msgstr ""
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Flokkur ekki gefin"
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Enginn flokkur til að bæta við?"
-
-#: 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 "Tegund ekki í boði."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID ekki í boði."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Villa við að bæta %s við eftirlæti."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Enginn flokkur valinn til eyðingar."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Villa við að fjarlægja %s úr eftirlæti."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -312,27 +273,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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 "Tegund ekki tilgreind"
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Villa"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Nafn forrits ekki tilgreint"
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Umbeðina skráin {file} ekki tiltæk!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Deilt"
@@ -341,7 +281,12 @@ msgstr "Deilt"
 msgid "Share"
 msgstr "Deila"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Villa"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Villa við deilingu"
 
@@ -373,7 +318,7 @@ msgstr "Deila með veftengli"
 msgid "Password protect"
 msgstr "Verja með lykilorði"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Lykilorð"
 
@@ -445,30 +390,58 @@ msgstr "eyða"
 msgid "share"
 msgstr "deila"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Verja með lykilorði"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Villa við að aftengja gildistíma"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Villa við að setja gildistíma"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Sendi ..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Tölvupóstur sendur"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Aðvörun"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Tegund ekki tilgreind"
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Eyða"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Bæta við"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -505,7 +478,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Notendanafn"
 
@@ -549,7 +522,7 @@ msgstr "Um mig"
 msgid "Users"
 msgstr "Notendur"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Forrit"
 
@@ -561,6 +534,34 @@ msgstr "Stjórnun"
 msgid "Help"
 msgstr "Hjálp"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Aðgangur bannaður"
@@ -590,14 +591,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Breyta flokkum"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Bæta við"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -687,12 +680,12 @@ msgstr "Virkja uppsetningu"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s er til boða. Fáðu meiri upplýsingar um hvernig þú uppfærir."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Útskrá"
 
@@ -710,19 +703,27 @@ msgstr "Ef þú breyttir ekki lykilorðinu þínu fyrir skömmu, er mögulegt a
 msgid "Please change your password to secure your account again."
 msgstr "Vinsamlegast breyttu lykilorðinu þínu til að tryggja öryggi þitt."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Týndir þú lykilorðinu?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "muna eftir mér"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "<strong>Skrá inn</strong>"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/is/files.po b/l10n/is/files.po
index 23bff8d67e324c36658ab0e506db357fbf950d0a..9bf8b42854d3999b6f95c7140a5e843e4abc29a2 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -74,15 +74,15 @@ msgstr "Tókst ekki að skrifa á disk"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Ógild mappa."
 
@@ -90,36 +90,36 @@ msgstr "Ógild mappa."
 msgid "Files"
 msgstr "Skrár"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Ekki nægt pláss tiltækt"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Hætt við innsendingu."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "Vefslóð má ekki vera tóm."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Villa"
 
@@ -131,7 +131,7 @@ msgstr "Deila"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Endurskýra"
 
@@ -163,13 +163,13 @@ msgstr "yfirskrifaði {new_name} með {old_name}"
 msgid "undo"
 msgstr "afturkalla"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -226,25 +226,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Nafn"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Stærð"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Breytt"
 
@@ -253,7 +253,7 @@ msgstr "Breytt"
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Senda inn"
 
@@ -289,65 +289,65 @@ msgstr "Hámarks inntaksstærð fyrir ZIP skrár"
 msgid "Save"
 msgstr "Vista"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nýtt"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Texta skrá"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Mappa"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Af tengli"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Hætta við innsendingu"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Ekkert hér. Settu eitthvað inn!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Niðurhal"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Hætta deilingu"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Eyða"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Innsend skrá er of stór"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Verið er að skima skrár, vinsamlegast hinkraðu."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Er að skima"
 
diff --git a/l10n/is/files_encryption.po b/l10n/is/files_encryption.po
index 2934c51ed1e4a88bcdea20786b00bb5ef38d63d1..f25da7310df210ee997b21afda172f91e9197978 100644
--- a/l10n/is/files_encryption.po
+++ b/l10n/is/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Dulkóðun"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po
index bfd1462e0561c1a47870de6038994ffafffa28e7..ab154f71f53dfbe19a2d7618d79a948de37e6bbe 100644
--- a/l10n/is/files_sharing.po
+++ b/l10n/is/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Lykilorð"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Senda"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s deildi möppunni %s með þér"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s deildi skránni %s með þér"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Niðurhal"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Senda inn"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Hætta við innsendingu"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Yfirlit ekki í boði fyrir"
diff --git a/l10n/is/files_trashbin.po b/l10n/is/files_trashbin.po
index 60884719266cac89ff00d17e3aed3da07bbc09d2..d6b54e203e6dd8f03d43dc6ea643ca78d976e32f 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -27,42 +27,10 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Villa"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr ""
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Nafn"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -71,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Nafn"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Eyða"
 
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index d98c32e3ffa56e9368b736a7458814d2cdcbf876..05b3d5d6d54b0c7e0579458633531e4b2d6e4044 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -369,14 +369,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -390,18 +394,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Prúfa uppsetningu"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Hjálp"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 55c578982ee3f4fcc5303c58cc60cbed10ba10f5..5f55897e422e0fa55a06772117f5945b8c4bc076 100644
--- a/l10n/it/core.po
+++ b/l10n/it/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 16:10+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -60,45 +60,6 @@ msgstr "Cache dei file aggiornata"
 msgid "... %d%% done ..."
 msgstr "... %d%% completato ..."
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Tipo di categoria non fornito."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Nessuna categoria da aggiungere?"
-
-#: ajax/vcategories/add.php:37
-#, 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
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Tipo di oggetto non fornito."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "ID %s non fornito."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Errore durante l'aggiunta di %s ai preferiti."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Nessuna categoria selezionata per l'eliminazione."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Errore durante la rimozione di %s dai preferiti."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Non è stata fornita alcun immagine o file"
@@ -315,27 +276,6 @@ msgstr "({count} selezionati)"
 msgid "Error loading file exists template"
 msgstr "Errore durante il caricamento del modello del file esistente"
 
-#: 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 "Il tipo di oggetto non è specificato."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Errore"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Il nome dell'applicazione non è specificato."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Il file richiesto {file} non è installato!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Condivisi"
@@ -344,7 +284,12 @@ msgstr "Condivisi"
 msgid "Share"
 msgstr "Condividi"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Errore"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Errore durante la condivisione"
 
@@ -376,7 +321,7 @@ msgstr "Condividi con collegamento"
 msgid "Password protect"
 msgstr "Proteggi con password"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Password"
 
@@ -448,30 +393,58 @@ msgstr "elimina"
 msgid "share"
 msgstr "condividi"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Protetta da password"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Errore durante la rimozione della data di scadenza"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Errore durante l'impostazione della data di scadenza"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Invio in corso..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Messaggio inviato"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Avviso"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Il tipo di oggetto non è specificato."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Elimina"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Aggiungi"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -508,7 +481,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Riceverai un collegamento per ripristinare la tua password via email"
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Nome utente"
 
@@ -552,7 +525,7 @@ msgstr "Personale"
 msgid "Users"
 msgstr "Utenti"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Applicazioni"
 
@@ -564,6 +537,34 @@ msgstr "Admin"
 msgid "Help"
 msgstr "Aiuto"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Accesso negato"
@@ -593,14 +594,6 @@ msgstr "La condivisione scadrà il %s.\n\n"
 msgid "Cheers!"
 msgstr "Saluti!"
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Modifica categorie"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Aggiungi"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -690,12 +683,12 @@ msgstr "Termina la configurazione"
 msgid "Finishing …"
 msgstr "Completamento..."
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Esci"
 
@@ -713,19 +706,27 @@ msgstr "Se non hai cambiato la password recentemente, il tuo account potrebbe es
 msgid "Please change your password to secure your account again."
 msgstr "Cambia la password per rendere nuovamente sicuro il tuo account."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Hai perso la password?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "ricorda"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Accedi"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Accessi alternativi"
 
diff --git a/l10n/it/files.po b/l10n/it/files.po
index d06b23a9a28edbcd4fcbe243ccb4b5107389d65a..7312af8f44630496989b5faaeb2e0c03f8d8a4d0 100644
--- a/l10n/it/files.po
+++ b/l10n/it/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 11:20+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -76,15 +76,15 @@ msgstr "Scrittura su disco non riuscita"
 msgid "Not enough storage available"
 msgstr "Spazio di archiviazione insufficiente"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr "Caricamento non riuscito. Impossibile ottenere informazioni sul file."
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Caricamento non riuscito. Impossibile trovare il file caricato."
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Cartella non valida."
 
@@ -92,36 +92,36 @@ msgstr "Cartella non valida."
 msgid "Files"
 msgstr "File"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Impossibile caricare {filename} poiché è una cartella oppure ha una dimensione di 0 byte."
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Spazio disponibile insufficiente"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Invio annullato"
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr "Impossibile ottenere il risultato dal server."
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "L'URL non può essere vuoto."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Nome della cartella non valido. L'uso di 'Shared' è riservato a ownCloud"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Errore"
 
@@ -133,7 +133,7 @@ msgstr "Condividi"
 msgid "Delete permanently"
 msgstr "Elimina definitivamente"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Rinomina"
 
@@ -165,13 +165,13 @@ msgstr "sostituito {new_name} con {old_name}"
 msgid "undo"
 msgstr "annulla"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n cartella"
 msgstr[1] "%n cartelle"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n file"
@@ -228,25 +228,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "La cifratura è stata disabilitata ma i tuoi file sono ancora cifrati. Vai nelle impostazioni personali per decifrare i file."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "Errore durante lo spostamento del file"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Dimensione"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Modificato"
 
@@ -255,7 +255,7 @@ msgstr "Modificato"
 msgid "%s could not be renamed"
 msgstr "%s non può essere rinominato"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Carica"
 
@@ -291,65 +291,65 @@ msgstr "Dimensione massima per i file ZIP"
 msgid "Save"
 msgstr "Salva"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nuovo"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "File di testo"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Cartella"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Da collegamento"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "File eliminati"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Annulla invio"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Qui non hai i permessi di scrittura."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Non c'è niente qui. Carica qualcosa!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Rimuovi condivisione"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Elimina"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Caricamento troppo grande"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "I file che stai provando a caricare superano la dimensione massima consentita su questo server."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Scansione dei file in corso, attendi"
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Scansione corrente"
 
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
index 9648bdc7e36292a9a627472746ed4bb7b22b6704..823ed4a1b60d3b1d48ab1fe96df378854bca770d 100644
--- a/l10n/it/files_encryption.po
+++ b/l10n/it/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -56,14 +56,14 @@ msgid ""
 "correct."
 msgstr "Impossibile aggiornare la password della chiave privata. Forse la vecchia password non era corretta."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -71,6 +71,18 @@ msgid ""
 "files."
 msgstr "La chiave privata non è valida! Forse la password è stata cambiata esternamente al sistema di ownCloud (ad es. la directory aziendale). Puoi aggiornare la password della chiave privata nelle impostazioni personali per ottenere nuovamente l'accesso ai file."
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "Requisiti mancanti."
@@ -82,7 +94,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata."
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "I seguenti utenti non sono configurati per la cifratura:"
 
@@ -92,97 +104,97 @@ msgstr "Salvataggio in corso..."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
-msgstr ""
+msgstr "Passa direttamente a"
 
 #: templates/invalid_private_key.php:8
 msgid "personal settings"
 msgstr "impostazioni personali"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Cifratura"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Abilita la chiave di recupero (permette di recuperare i file utenti in caso di perdita della password):"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "Password della chiave di recupero"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
-msgstr ""
+msgstr "Ripeti la password della chiave di recupero"
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Abilitata"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Disabilitata"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "Cambia la password della chiave di recupero:"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "Vecchia password della chiave di recupero"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "Nuova password della chiave di recupero"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
-msgstr ""
+msgstr "Ripeti la nuova password della chiave di recupero"
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Modifica password"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "La password della chiave privata non corrisponde più alla password di accesso:"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "Imposta la vecchia password della chiave privata sull'attuale password di accesso."
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file."
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Vecchia password di accesso"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Password di accesso attuale"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "Aggiorna la password della chiave privata"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Abilita il ripristino della password:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "L'abilitazione di questa opzione ti consentirà di accedere nuovamente ai file cifrati in caso di perdita della password"
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "Impostazioni di ripristino dei file aggiornate"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "Impossibile aggiornare il ripristino dei file"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index 01ae61c6aea21327bf43d549c37f2b8a83457695..768fd404ce3599e3a8ff84a8d4819c9c6df11f06 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 05: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"
@@ -20,17 +20,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr "Questa condivione è protetta da password"
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "La password è errata. Prova ancora."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Password"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Invia"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Spiacenti, questo collegamento sembra non essere più attivo."
@@ -55,28 +55,28 @@ msgstr "la condivisione è disabilitata"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Per ulteriori informazioni, chiedi alla persona che ti ha inviato il collegamento."
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ha condiviso la cartella %s con te"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ha condiviso il file %s con te"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Carica"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Annulla il caricamento"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Nessuna anteprima disponibile per"
diff --git a/l10n/it/files_trashbin.po b/l10n/it/files_trashbin.po
index b6c4e7090dd31518ea681eaa711e4370e5aed3d8..c13d546549f81bc858cab3e57da386d4bb646625 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -28,42 +28,10 @@ msgstr "Impossibile eliminare %s definitivamente"
 msgid "Couldn't restore %s"
 msgstr "Impossibile ripristinare %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "esegui operazione di ripristino"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Errore"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "elimina il file definitivamente"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Elimina definitivamente"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Nome"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Eliminati"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n cartella"
-msgstr[1] "%n cartelle"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n file"
-msgstr[1] "%n file"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "ripristinati"
@@ -72,11 +40,19 @@ msgstr "ripristinati"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Qui non c'è niente. Il tuo cestino è vuoto."
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Nome"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Ripristina"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Eliminati"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Elimina"
 
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 2c63238f98d884836455a227ad49a87c70b7411c..f802734277b5e9234aa7eca99ef63a608a57fcc3 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -369,14 +369,18 @@ msgid ""
 msgstr "In modo predefinito, l'attributo UUID viene rilevato automaticamente. L'attributo UUID è utilizzato per identificare senza alcun dubbio gli utenti e i gruppi LDAP. Inoltre, il nome utente interno sarà creato sulla base dell'UUID, se non è specificato in precedenza. Puoi ignorare l'impostazione e fornire un attributo di tua scelta. Assicurati che l'attributo scelto possa essere ottenuto sia per gli utenti che per i gruppi e che sia univoco. Lascialo vuoto per ottenere il comportamento predefinito. Le modifiche avranno effetto solo sui nuovi utenti e gruppi LDAP associati (aggiunti)."
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "Attributo UUID:"
+msgid "UUID Attribute for Users:"
+msgstr ""
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "Associazione Nome utente-Utente LDAP"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -390,18 +394,18 @@ msgid ""
 "experimental stage."
 msgstr "I nomi utente sono utilizzati per archiviare e assegnare i (meta) dati. Per identificare con precisione e riconoscere gli utenti, ogni utente LDAP avrà un nome utente interno. Ciò richiede un'associazione tra il nome utente e l'utente LDAP. In aggiunta, il DN viene mantenuto in cache per ridurre l'interazione con LDAP, ma non è utilizzato per l'identificazione. Se il DN cambia, le modifiche saranno rilevate. Il nome utente interno è utilizzato dappertutto. La cancellazione delle associazioni lascerà tracce residue ovunque e interesserà esclusivamente la configurazione LDAP. Non cancellare mai le associazioni in un ambiente di produzione, ma solo in una fase sperimentale o di test."
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Cancella associazione Nome utente-Utente LDAP"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Cancella associazione Nome gruppo-Gruppo LDAP"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Prova configurazione"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Aiuto"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index 6acbccfcf888019da5fb3042562edfbef655fc9e..ced5f075132914296ef7257f851d95cc00064d47 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -60,45 +60,6 @@ msgstr "ファイルキャッシュ更新完了"
 msgid "... %d%% done ..."
 msgstr "... %d%% 完了 ..."
 
-#: 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 "このカテゴリはすでに存在します: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "オブジェクトタイプは提供されていません。"
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID は提供されていません。"
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "お気に入りに %s を追加エラー"
-
-#: 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 "お気に入りから %s の削除エラー"
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "画像もしくはファイルが提供されていません"
@@ -310,27 +271,6 @@ msgstr "({count} 選択)"
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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 "必要なファイル {file} がインストールされていません!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "共有中"
@@ -339,7 +279,12 @@ msgstr "共有中"
 msgid "Share"
 msgstr "共有"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "エラー"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "共有でエラー発生"
 
@@ -371,7 +316,7 @@ msgstr "URLリンクで共有"
 msgid "Password protect"
 msgstr "パスワード保護"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "パスワード"
 
@@ -443,30 +388,58 @@ msgstr "削除"
 msgid "share"
 msgstr "共有"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "パスワード保護"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "有効期限の未設定エラー"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "有効期限の設定でエラー発生"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "送信中..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "メールを送信しました"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "警告"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "オブジェクタイプが指定されていません。"
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "削除"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "追加"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -503,7 +476,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "メールでパスワードをリセットするリンクが届きます。"
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "ユーザー名"
 
@@ -547,7 +520,7 @@ msgstr "個人"
 msgid "Users"
 msgstr "ユーザ"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "アプリ"
 
@@ -559,6 +532,34 @@ msgstr "管理"
 msgid "Help"
 msgstr "ヘルプ"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "アクセスが禁止されています"
@@ -588,14 +589,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "カテゴリを編集"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "追加"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -685,12 +678,12 @@ msgstr "セットアップを完了します"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s が利用可能です。更新方法に関してさらに情報を取得して下さい。"
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "ログアウト"
 
@@ -708,19 +701,27 @@ msgstr "最近パスワードを変更していない場合、あなたのアカ
 msgid "Please change your password to secure your account again."
 msgstr "アカウント保護の為、パスワードを再度の変更をお願いいたします。"
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "パスワードを忘れましたか?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "パスワードを記憶する"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "ログイン"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "代替ログイン"
 
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 1f6469f9e0c4de21e07c5f0ee285816646d5e8c4..0f7b135778705c044ae7cd535821d13e36cab42c 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -79,15 +79,15 @@ msgstr "ディスクへの書き込みに失敗しました"
 msgid "Not enough storage available"
 msgstr "ストレージに十分な空き容量がありません"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr "アップロードに失敗。ファイル情報を取得できませんでした。"
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr "アップロードに失敗。アップロード済みのファイルを見つけることができませんでした。"
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "無効なディレクトリです。"
 
@@ -95,36 +95,36 @@ msgstr "無効なディレクトリです。"
 msgid "Files"
 msgstr "ファイル"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "ディレクトリもしくは0バイトのため {filename} をアップロードできません"
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "利用可能なスペースが十分にありません"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "アップロードはキャンセルされました。"
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr "サーバから結果を取得できませんでした。"
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。"
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URLは空にできません。"
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "無効なフォルダ名です。'Shared' の利用はownCloudで予約済みです"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "エラー"
 
@@ -136,7 +136,7 @@ msgstr "共有"
 msgid "Delete permanently"
 msgstr "完全に削除する"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "名前の変更"
 
@@ -168,12 +168,12 @@ msgstr "{old_name} を {new_name} に置換"
 msgid "undo"
 msgstr "元に戻す"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n個のフォルダ"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n個のファイル"
@@ -228,25 +228,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。"
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。"
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "ファイルの移動エラー"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "名前"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "サイズ"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "変更"
 
@@ -255,7 +255,7 @@ msgstr "変更"
 msgid "%s could not be renamed"
 msgstr "%sの名前を変更できませんでした"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "アップロード"
 
@@ -291,65 +291,65 @@ msgstr "ZIPファイルへの最大入力サイズ"
 msgid "Save"
 msgstr "保存"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "新規作成"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "テキストファイル"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "フォルダ"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "リンク"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "削除ファイル"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "アップロードをキャンセル"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "あなたには書き込み権限がありません。"
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "ここには何もありません。何かアップロードしてください。"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "ダウンロード"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "共有解除"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "削除"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "アップロードには大きすぎます。"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。"
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "ファイルをスキャンしています、しばらくお待ちください。"
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "スキャン中"
 
diff --git a/l10n/ja_JP/files_encryption.po b/l10n/ja_JP/files_encryption.po
index abaa14b511fd05156072e5785590bcb274fe1a85..76ee316f13c046e65784761db94d37293263b2c2 100644
--- a/l10n/ja_JP/files_encryption.po
+++ b/l10n/ja_JP/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -56,14 +56,14 @@ msgid ""
 "correct."
 msgstr "秘密鍵のパスワードを更新できませんでした。古いパスワードが正確でない場合があります。"
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -71,6 +71,18 @@ msgid ""
 "files."
 msgstr "秘密鍵が有効ではありません。パスワードがownCloudシステムの外部(例えば、企業ディレクトリ)から変更された恐れがあります。個人設定で秘密鍵のパスワードを更新して、暗号化されたファイルを回復出来ます。"
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "必要要件が満たされていません。"
@@ -82,7 +94,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "必ず、PHP 5.3.3もしくはそれ以上をインストールし、同時にOpenSSLのPHP拡張を有効にした上でOpenSSLも同様にインストール、適切に設定してください。現時点では暗号化アプリは無効になっています。"
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "以下のユーザーは、暗号化設定がされていません:"
 
@@ -98,91 +110,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "秘密鍵をアンロックできます"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "暗号化"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "復旧キーを有効化 (万一パスワードを亡くした場合もユーザーのファイルを回復できる):"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "復旧キーのパスワード"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "有効"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "無効"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "復旧キーのパスワードを変更:"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "古い復旧キーのパスワード"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "新しい復旧キーのパスワード"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "パスワードを変更"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "もはや秘密鍵はログインパスワードと一致しません:"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "古い秘密鍵のパスワードを現在のログインパスワードに設定する。"
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "古いパスワードを覚えていない場合、管理者に尋ねてファイルを回復することができます。"
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "古いログインパスワード"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "現在のログインパスワード"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "秘密鍵のパスワードを更新"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "パスワード復旧を有効化:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "このオプションを有効にすると、パスワードを紛失した場合も、暗号化されたファイルに再度アクセスすることができるようになります。"
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "ファイル復旧設定が更新されました"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "ファイル復旧を更新できませんでした"
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index 71e37cb9fda29e8c730c9fccb786b5e317e00749..22cad8ec4714723a566a8cf7e1b02b013b873ca5 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/files_sharing.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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
-"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "パスワードが間違っています。再試行してください。"
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "パスワード"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "送信"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "申し訳ございません。このリンクはもう利用できません。"
@@ -54,28 +54,28 @@ msgstr "共有が無効になっています"
 msgid "For more info, please ask the person who sent this link."
 msgstr "不明な点は、こちらのリンクの提供者に確認をお願いします。"
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s はフォルダー %s をあなたと共有中です"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s はファイル %s をあなたと共有中です"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "ダウンロード"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "アップロード"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "アップロードをキャンセル"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "プレビューはありません"
diff --git a/l10n/ja_JP/files_trashbin.po b/l10n/ja_JP/files_trashbin.po
index b865b55bdc159abd1a5365ad1b33f892c1017f75..0ddc42354e0936e1366984b1474af277ad2145af 100644
--- a/l10n/ja_JP/files_trashbin.po
+++ b/l10n/ja_JP/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: plazmism <gomidori@live.jp>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -29,40 +29,10 @@ msgstr "%s を完全に削除出来ませんでした"
 msgid "Couldn't restore %s"
 msgstr "%s を復元出来ませんでした"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "復元操作を実行する"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "エラー"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "ファイルを完全に削除する"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "完全に削除する"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "名前"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "削除済み"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n個のフォルダ"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n個のファイル"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "復元済"
@@ -71,11 +41,19 @@ msgstr "復元済"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "ここには何もありません。ゴミ箱は空です!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "名前"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "復元"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "削除済み"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "削除"
 
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index 55f63dc2434f5cb78729a000589cdb690271a9be..cdc491119a01bbe119a2c6d4cc561925b1c60c57 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -370,14 +370,18 @@ msgid ""
 msgstr "デフォルトでは、UUID 属性は自動的に検出されます。UUID属性は、LDAPユーザとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザ名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング(追加)されたLDAPユーザとLDAPグループに対してのみ有効となります。"
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "UUID属性:"
+msgid "UUID Attribute for Users:"
+msgstr ""
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "ユーザ名とLDAPユーザのマッピング"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -391,18 +395,18 @@ msgid ""
 "experimental stage."
 msgstr "ユーザ名は(メタ)データの保存と割り当てに使用されます。ユーザを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ユーザ名からLDAPユーザへのマッピングが必要であることを意味しています。この生成されたユーザ名は、LDAPユーザのUUIDにマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更が検出されます。内部ユーザ名は全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全てのLDAPの設定に影響を与えます!本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "ユーザ名とLDAPユーザのマッピングをクリアする"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "グループ名とLDAPグループのマッピングをクリアする"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "設定をテスト"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "ヘルプ"
diff --git a/l10n/ka/core.po b/l10n/ka/core.po
index 9b04573ae740b456f148da686293c6b8b0d1f439..3005c8823f71a5d20b472be4aacfafc1e1367302 100644
--- a/l10n/ka/core.po
+++ b/l10n/ka/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -306,27 +267,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -335,7 +275,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr ""
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -367,7 +312,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "პაროლი"
 
@@ -439,30 +384,58 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -499,7 +472,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr ""
 
@@ -543,7 +516,7 @@ msgstr "პერსონა"
 msgid "Users"
 msgstr "მომხმარებლები"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr ""
 
@@ -555,6 +528,34 @@ msgstr "ადმინისტრატორი"
 msgid "Help"
 msgstr "შველა"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -584,14 +585,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr ""
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -681,12 +674,12 @@ msgstr ""
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr ""
 
@@ -704,19 +697,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ka/files_encryption.po b/l10n/ka/files_encryption.po
index 6352ac21942b86de4777bd7006c5da55d3ef7b89..39aa66f96fe51ef903cdd45470cb1f31f4e0272d 100644
--- a/l10n/ka/files_encryption.po
+++ b/l10n/ka/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ka/files_sharing.po b/l10n/ka/files_sharing.po
index efd2890682d94b122f50e50d47f728273511c2ed..f7e5a8f5186d24652833037b6796f0d34754cc1a 100644
--- a/l10n/ka/files_sharing.po
+++ b/l10n/ka/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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -18,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "პაროლი"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr ""
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "გადმოწერა"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/ka/files_trashbin.po b/l10n/ka/files_trashbin.po
index 36d83d1478b5c917f08b8a02700f76f2a31983a2..fd709c4c6140baa5bbd78dada3c593651aadb4ff 100644
--- a/l10n/ka/files_trashbin.po
+++ b/l10n/ka/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-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -27,53 +27,31 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:100
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:36
-msgid "delete file permanently"
+#: lib/trashbin.php:814 lib/trashbin.php:816
+msgid "restored"
 msgstr ""
 
-#: js/trash.js:127
-msgid "Delete permanently"
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: js/trash.js:182 templates/index.php:17
+#: templates/index.php:23
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:183 templates/index.php:27
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:191
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/trash.js:197
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
-#: lib/trash.php:819 lib/trash.php:821
-msgid "restored"
-msgstr ""
-
-#: templates/index.php:9
-msgid "Nothing in here. Your trash bin is empty!"
+#: templates/index.php:26 templates/index.php:28
+msgid "Restore"
 msgstr ""
 
-#: templates/index.php:20 templates/index.php:22
-msgid "Restore"
+#: templates/index.php:34
+msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:30 templates/index.php:31
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr ""
 
diff --git a/l10n/ka/user_ldap.po b/l10n/ka/user_ldap.po
index 44a23bfdf94c80191a3dd3c2954ea5a4515eb0ee..fa5681d79ec3f3ded21a1380746f3d7e70e2deb5 100644
--- a/l10n/ka/user_ldap.po
+++ b/l10n/ka/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "შველა"
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index 82e176ee72c813ed528b16537289c380f1c6ea49..5aa843a2a52cb9be09a6a879e25910dd84be3db2 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:31+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 "კატეგორია უკვე არსებობს: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "ობიექტის ტიპი არ არის განხილული."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID არ არის განხილული"
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "შეცდომა %s–ის ფევორიტებში დამატების დროს."
-
-#: 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 "შეცდომა  %s–ის ფევორიტებიდან წაშლის დროს."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -306,27 +267,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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 "მოთხოვნილი ფაილი  {file} არ არის დაინსტალირებული."
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "გაზიარებული"
@@ -335,7 +275,12 @@ msgstr "გაზიარებული"
 msgid "Share"
 msgstr "გაზიარება"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "შეცდომა"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "შეცდომა გაზიარების დროს"
 
@@ -367,7 +312,7 @@ msgstr "გაუზიარე ლინკით"
 msgid "Password protect"
 msgstr "პაროლით დაცვა"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "პაროლი"
 
@@ -439,30 +384,58 @@ msgstr "წაშლა"
 msgid "share"
 msgstr "გაზიარება"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "პაროლით დაცული"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "შეცდომა ვადის გასვლის მოხსნის დროს"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "შეცდომა ვადის გასვლის მითითების დროს"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "გაგზავნა ...."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "იმეილი გაიგზავნა"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "გაფრთხილება"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "ობიექტის ტიპი არ არის მითითებული."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "წაშლა"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "დამატება"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -499,7 +472,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე"
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "მომხმარებლის სახელი"
 
@@ -543,7 +516,7 @@ msgstr "პირადი"
 msgid "Users"
 msgstr "მომხმარებელი"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "აპლიკაციები"
 
@@ -555,6 +528,34 @@ msgstr "ადმინისტრატორი"
 msgid "Help"
 msgstr "დახმარება"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "წვდომა აკრძალულია"
@@ -584,14 +585,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "კატეგორიების რედაქტირება"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "დამატება"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -681,12 +674,12 @@ msgstr "კონფიგურაციის დასრულება"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "გამოსვლა"
 
@@ -704,19 +697,27 @@ msgstr "თუ თქვენ არ შეცვლით პაროლს,
 msgid "Please change your password to secure your account again."
 msgstr "გთხოვთ შეცვალოთ თქვენი პაროლი, თქვენი ანგარიშის დასაცავად."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "დაგავიწყდათ პაროლი?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "დამახსოვრება"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "შესვლა"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "ალტერნატიული Login–ი"
 
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index aa39ed90afd8ae5317f2980982c4ce0dc2a2aa89..e9fd5d776d649ee3a797094e9949773d9a7efbb3 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -74,15 +74,15 @@ msgstr "შეცდომა დისკზე ჩაწერისას"
 msgid "Not enough storage available"
 msgstr "საცავში საკმარისი ადგილი არ არის"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "დაუშვებელი დირექტორია."
 
@@ -90,36 +90,36 @@ msgstr "დაუშვებელი დირექტორია."
 msgid "Files"
 msgstr "ფაილები"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "საკმარისი ადგილი არ არის"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "ატვირთვა შეჩერებულ იქნა."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას"
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL არ შეიძლება იყოს ცარიელი."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "შეცდომა"
 
@@ -131,7 +131,7 @@ msgstr "გაზიარება"
 msgid "Delete permanently"
 msgstr "სრულად წაშლა"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "გადარქმევა"
 
@@ -163,12 +163,12 @@ msgstr "{new_name} შეცვლილია {old_name}–ით"
 msgid "undo"
 msgstr "დაბრუნება"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -223,25 +223,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "გადმოწერის მოთხოვნა მუშავდება. ის მოითხოვს გარკვეულ დროს რაგდან ფაილები არის დიდი ზომის."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "სახელი"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "ზომა"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "შეცვლილია"
 
@@ -250,7 +250,7 @@ msgstr "შეცვლილია"
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "ატვირთვა"
 
@@ -286,65 +286,65 @@ msgstr "ZIP ფაილების მაქსიმუმ დასაშვ
 msgid "Save"
 msgstr "შენახვა"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "ახალი"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "ტექსტური ფაილი"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "საქაღალდე"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "მისამართიდან"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "წაშლილი ფაილები"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "ატვირთვის გაუქმება"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "თქვენ არ გაქვთ ჩაწერის უფლება აქ."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "აქ არაფერი არ არის. ატვირთე რამე!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "ჩამოტვირთვა"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "გაუზიარებადი"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "წაშლა"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "ასატვირთი ფაილი ძალიან დიდია"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "მიმდინარე სკანირება"
 
diff --git a/l10n/ka_GE/files_encryption.po b/l10n/ka_GE/files_encryption.po
index aabac597806b5f0acaf66ce044fc4cdd52280b87..b50e88628a164f84b8a224ebbe7db677c0abc357 100644
--- a/l10n/ka_GE/files_encryption.po
+++ b/l10n/ka_GE/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "ენკრიპცია"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po
index c53f2326209db86a7e68939452a97fa8afe61b27..dfe7c727716c11f2525f3ebcff4c2a2fd9de4101 100644
--- a/l10n/ka_GE/files_sharing.po
+++ b/l10n/ka_GE/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "პაროლი"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "გაგზავნა"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s–მა გაგიზიარათ ფოლდერი %s"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s–მა გაგიზიარათ ფაილი %s"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "ჩამოტვირთვა"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "ატვირთვა"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "ატვირთვის გაუქმება"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "წინასწარი დათვალიერება შეუძლებელია"
diff --git a/l10n/ka_GE/files_trashbin.po b/l10n/ka_GE/files_trashbin.po
index e7d9fa72e7732d377819d7e23c6c96137ec98b71..7a6810fb30221fdce22e630e32b2f2c2b40aece3 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -27,40 +27,10 @@ msgstr "ფაილი %s–ის სრულად წაშლა ვერ
 msgid "Couldn't restore %s"
 msgstr "%s–ის აღდგენა ვერ მოხერხდა"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "მიმდინარეობს აღდგენის ოპერაცია"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "შეცდომა"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "ფაილის სრულად წაშლა"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "სრულად წაშლა"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "სახელი"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "წაშლილი"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -69,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "აქ არაფერი არ არის. სანაგვე ყუთი ცარიელია!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "სახელი"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "აღდგენა"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "წაშლილი"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "წაშლა"
 
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index 3f5f3173d5a31f727525095474e851669f7a7bd8..4c74ff9ca9bcfcbac7550e876ca9c664daba22c0 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "კავშირის ტესტირება"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "დახმარება"
diff --git a/l10n/km/core.po b/l10n/km/core.po
index 7aeec466eff777e74364cc3f98adc4e160286643..5958a93a59db47c1464852b3113a614e22c7de6e 100644
--- a/l10n/km/core.po
+++ b/l10n/km/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
 "MIME-Version: 1.0\n"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -306,27 +267,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -335,7 +275,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr ""
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -367,7 +312,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr ""
 
@@ -439,30 +384,58 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -499,7 +472,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr ""
 
@@ -543,7 +516,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr ""
 
@@ -555,6 +528,34 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -584,14 +585,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr ""
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -681,12 +674,12 @@ msgstr ""
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr ""
 
@@ -704,19 +697,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/km/files_encryption.po b/l10n/km/files_encryption.po
index 2900ce69642d96c14dff686b9fdf3f25f2ca9a54..cafdfe741a3b19ab0ba5893d1e8cc233d5753f83 100644
--- a/l10n/km/files_encryption.po
+++ b/l10n/km/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
 "MIME-Version: 1.0\n"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/km/files_sharing.po b/l10n/km/files_sharing.po
index f12cf3ccbe1ffc8151eacc0383c524cac7bdc864..a8e71bbaaef9adfc52f35e06bac81c3c67fa764d 100644
--- a/l10n/km/files_sharing.po
+++ b/l10n/km/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-12 11:11+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
-msgid "Password"
+msgid "The password is wrong. Try again."
 msgstr ""
 
-#: templates/authenticate.php:9
-msgid "Submit"
+#: templates/authenticate.php:10
+msgid "Password"
 msgstr ""
 
 #: templates/part.404.php:3
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/km/files_trashbin.po b/l10n/km/files_trashbin.po
index f3aa613a53e7d3d7de878e140d61b581ba378fb5..da11ae02db484fc33a8edabd16f9bcc0187e6fff 100644
--- a/l10n/km/files_trashbin.po
+++ b/l10n/km/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-12 11:11+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
 "MIME-Version: 1.0\n"
@@ -27,53 +27,31 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:37
-msgid "delete file permanently"
+#: lib/trashbin.php:814 lib/trashbin.php:816
+msgid "restored"
 msgstr ""
 
-#: js/trash.js:129
-msgid "Delete permanently"
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: js/trash.js:184 templates/index.php:17
+#: templates/index.php:23
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:185 templates/index.php:27
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:193
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/trash.js:199
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
-#: lib/trash.php:814 lib/trash.php:816
-msgid "restored"
-msgstr ""
-
-#: templates/index.php:9
-msgid "Nothing in here. Your trash bin is empty!"
+#: templates/index.php:26 templates/index.php:28
+msgid "Restore"
 msgstr ""
 
-#: templates/index.php:20 templates/index.php:22
-msgid "Restore"
+#: templates/index.php:34
+msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:30 templates/index.php:31
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr ""
 
diff --git a/l10n/km/user_ldap.po b/l10n/km/user_ldap.po
index c6be8c9e68f30d4685f755b0b60accba727dccd7..bebbe6a2c23d7fccd8c6876567ccde3ba69db742 100644
--- a/l10n/km/user_ldap.po
+++ b/l10n/km/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-09-13 21:47-0400\n"
-"PO-Revision-Date: 2013-09-12 11:11+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
 "MIME-Version: 1.0\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:36
+#: ajax/testConfiguration.php:37
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:39
+#: ajax/testConfiguration.php:40
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:43
+#: ajax/testConfiguration.php:44
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr ""
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
index 00a0ea10981de7cbf69d0f1ebe6dd727700816eb..b30f320c957929644cab3c37f1465aef47f72680 100644
--- a/l10n/kn/core.po
+++ b/l10n/kn/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -306,27 +267,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -335,7 +275,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr ""
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -367,7 +312,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr ""
 
@@ -439,30 +384,58 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -499,7 +472,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr ""
 
@@ -543,7 +516,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr ""
 
@@ -555,6 +528,34 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -584,14 +585,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr ""
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -681,12 +674,12 @@ msgstr ""
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr ""
 
@@ -704,19 +697,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/kn/files_encryption.po b/l10n/kn/files_encryption.po
index 979036dc70dfb4bee273fd19bdcec63f700026d1..6ea1431b1f28e5d083f6b1c001485cdba67edad6 100644
--- a/l10n/kn/files_encryption.po
+++ b/l10n/kn/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/kn/files_sharing.po b/l10n/kn/files_sharing.po
index b4ca53433143dd6e89165aab87c585009c5777e3..e933283838a244683fbfba3ef551f24f1ce05708 100644
--- a/l10n/kn/files_sharing.po
+++ b/l10n/kn/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-07-31 01:55-0400\n"
-"PO-Revision-Date: 2013-07-31 05:56+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
-msgid "Password"
+msgid "The password is wrong. Try again."
 msgstr ""
 
-#: templates/authenticate.php:9
-msgid "Submit"
+#: templates/authenticate.php:10
+msgid "Password"
 msgstr ""
 
 #: templates/part.404.php:3
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:85
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/kn/files_trashbin.po b/l10n/kn/files_trashbin.po
index 4a8a4c3ae7630c84283190b2b60bd19ca2b9be1d..15941b3799dbeea4da920907e364217f1f989eaf 100644
--- a/l10n/kn/files_trashbin.po
+++ b/l10n/kn/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-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -27,53 +27,31 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:100
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:36
-msgid "delete file permanently"
+#: lib/trashbin.php:814 lib/trashbin.php:816
+msgid "restored"
 msgstr ""
 
-#: js/trash.js:127
-msgid "Delete permanently"
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: js/trash.js:182 templates/index.php:17
+#: templates/index.php:23
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:183 templates/index.php:27
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:191
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/trash.js:197
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
-#: lib/trash.php:819 lib/trash.php:821
-msgid "restored"
-msgstr ""
-
-#: templates/index.php:9
-msgid "Nothing in here. Your trash bin is empty!"
+#: templates/index.php:26 templates/index.php:28
+msgid "Restore"
 msgstr ""
 
-#: templates/index.php:20 templates/index.php:22
-msgid "Restore"
+#: templates/index.php:34
+msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:30 templates/index.php:31
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr ""
 
diff --git a/l10n/kn/user_ldap.po b/l10n/kn/user_ldap.po
index 24c7a343258fedd7f3536894d8cc1c89b08b0d4c..65a7043e679318343c2488c5ec9b639504cd29ea 100644
--- a/l10n/kn/user_ldap.po
+++ b/l10n/kn/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:36
+#: ajax/testConfiguration.php:37
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:39
+#: ajax/testConfiguration.php:40
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:43
+#: ajax/testConfiguration.php:44
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr ""
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index bb96c9eee85049a6ba3fd11d4090b8c3e1e37558..f67e5c85a2f5da29a1ef95ec68cc3f960a06690a 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -58,45 +58,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 "분류가 이미 존재합니다: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "객체 형식이 제공되지 않았습니다."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID가 제공되지 않았습니다."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "책갈피에 %s을(를) 추가할 수 없었습니다."
-
-#: 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 "책갈피에서 %s을(를) 삭제할 수 없었습니다."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -308,27 +269,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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 "필요한 파일 {file}이(가) 설치되지 않았습니다!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "공유됨"
@@ -337,7 +277,12 @@ msgstr "공유됨"
 msgid "Share"
 msgstr "공유"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "오류"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "공유하는 중 오류 발생"
 
@@ -369,7 +314,7 @@ msgstr "URL 링크로 공유"
 msgid "Password protect"
 msgstr "암호 보호"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "암호"
 
@@ -441,30 +386,58 @@ msgstr "삭제"
 msgid "share"
 msgstr "공유"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "암호로 보호됨"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "만료 날짜 해제 오류"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "만료 날짜 설정 오류"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "전송 중..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "이메일 발송됨"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "경고"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "객체 유형이 지정되지 않았습니다."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "삭제"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "추가"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -501,7 +474,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "이메일로 암호 재설정 링크를 보냈습니다."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "사용자 이름"
 
@@ -545,7 +518,7 @@ msgstr "개인"
 msgid "Users"
 msgstr "사용자"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "앱"
 
@@ -557,6 +530,34 @@ msgstr "관리자"
 msgid "Help"
 msgstr "도움말"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "접근 금지됨"
@@ -586,14 +587,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "분류 수정"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "추가"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -683,12 +676,12 @@ msgstr "설치 완료"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "로그아웃"
 
@@ -706,19 +699,27 @@ msgstr "최근에 암호를 변경하지 않았다면 계정이 탈취되었을
 msgid "Please change your password to secure your account again."
 msgstr "계정의 안전을 위하여 암호를 변경하십시오."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "암호를 잊으셨습니까?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "기억하기"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "로그인"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "대체 "
 
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 477d53371ac82cc60e32daf17f85bb184d3a06c9..eb3600fa847a67b3d13c327ca089973e469a4c40 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -77,15 +77,15 @@ msgstr "디스크에 쓰지 못했습니다"
 msgid "Not enough storage available"
 msgstr "저장소가 용량이 충분하지 않습니다."
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr "업로드에 실패했습니다. 파일 정보를 가져올수 없습니다."
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr "업로드에 실패했습니다. 업로드할 파일을 찾을수 없습니다"
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "올바르지 않은 디렉터리입니다."
 
@@ -93,36 +93,36 @@ msgstr "올바르지 않은 디렉터리입니다."
 msgid "Files"
 msgstr "파일"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "{filename}을 업로드 할수 없습니다. 폴더이거나 0 바이트 파일입니다."
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "여유 공간이 부족합니다"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "업로드가 취소되었습니다."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr "서버에서 결과를 가져올수 없습니다."
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL을 입력해야 합니다."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "유효하지 않은 폴더명입니다. \"Shared\" 이름의 사용은 OwnCloud 가 이미 예약하고 있습니다."
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "오류"
 
@@ -134,7 +134,7 @@ msgstr "공유"
 msgid "Delete permanently"
 msgstr "영원히 삭제"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "이름 바꾸기"
 
@@ -166,12 +166,12 @@ msgstr "{old_name}이(가) {new_name}(으)로 대체됨"
 msgid "undo"
 msgstr "되돌리기"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "폴더 %n"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "파일 %n 개"
@@ -226,25 +226,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "암호화는 해제되어 있지만, 파일은 아직 암호화 되어 있습니다. 개인 설저에 가셔서 암호를 해제하십시오"
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "다운로드가 준비 중입니다. 파일 크기가 크다면 시간이 오래 걸릴 수도 있습니다."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "파일 이동 오류"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "이름"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "크기"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "수정됨"
 
@@ -253,7 +253,7 @@ msgstr "수정됨"
 msgid "%s could not be renamed"
 msgstr "%s 의 이름을 변경할수 없습니다"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "업로드"
 
@@ -289,65 +289,65 @@ msgstr "ZIP 파일 최대 크기"
 msgid "Save"
 msgstr "저장"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "새로 만들기"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "텍스트 파일"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "폴더"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "링크에서"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "파일 삭제됨"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "업로드 취소"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "당신은 여기에 쓰기를 할 수 있는 권한이 없습니다."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "내용이 없습니다. 업로드할 수 있습니다!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "다운로드"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "공유 해제"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "삭제"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "업로드한 파일이 너무 큼"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "파일을 검색하고 있습니다. 기다려 주십시오."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "현재 검색"
 
diff --git a/l10n/ko/files_encryption.po b/l10n/ko/files_encryption.po
index b994394ff1177fabdf1ac13df15a8231cd657cbe..72dee154cfe2ee420d0dd66404856e5b48ee8647 100644
--- a/l10n/ko/files_encryption.po
+++ b/l10n/ko/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -54,14 +54,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -69,6 +69,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -80,7 +92,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -96,91 +108,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "개인 설정"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "암호화"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "키 비밀번호 복구"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "복구 키 비밀번호 변경"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "예전 복구 키 비밀번호"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "새 복구 키 비밀번호"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "암호 변경"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "예전 로그인 암호"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "현재 로그인 암호"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "개인 키 암호 업데이트"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "파일 복구 설정 업데이트됨"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "파일 복구를 업데이트 할수 없습니다"
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index da94ad321107391e1cd8d25755d00d873171900e..8fd11b0586e2702a931b679ff0cc021db46a59f8 100644
--- a/l10n/ko/files_sharing.po
+++ b/l10n/ko/files_sharing.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-09-30 10:16-0400\n"
-"PO-Revision-Date: 2013-09-29 10:14+0000\n"
-"Last-Translator: smallsnail <bjh13579@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "비밀번호가 틀립니다. 다시 입력해주세요."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "암호"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "제출"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "죄송합니다만 이 링크는 더이상 작동되지 않습니다."
@@ -54,28 +54,28 @@ msgstr "공유가 비활성되었습니다"
 msgid "For more info, please ask the person who sent this link."
 msgstr "더 자세한 설명은 링크를 보내신 분에게 여쭤보십시오"
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s 님이 폴더 %s을(를) 공유하였습니다"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s 님이 파일 %s을(를) 공유하였습니다"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "다운로드"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "업로드"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "업로드 취소"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "다음 항목을 미리 볼 수 없음:"
diff --git a/l10n/ko/files_trashbin.po b/l10n/ko/files_trashbin.po
index 4d9bdc7e4815cdcb03528454f4211b0817ed3111..901162cb12d808123d41df3471117d0e469f6b92 100644
--- a/l10n/ko/files_trashbin.po
+++ b/l10n/ko/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: smallsnail <bjh13579@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -28,40 +28,10 @@ msgstr "%s를 영구적으로 삭제할수 없습니다"
 msgid "Couldn't restore %s"
 msgstr "%s를 복원할수 없습니다"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "복원 작업중"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "오류"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "영구적으로 파일 삭제하기"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "영원히 삭제"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "이름"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "삭제됨"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "폴더 %n개"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "파일 %n개 "
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "복원됨"
@@ -70,11 +40,19 @@ msgstr "복원됨"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "현재 휴지통은 비어있습니다!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "이름"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "복원"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "삭제됨"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "삭제"
 
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index fc5af73331837032762a045b247e0fd554cdaf68..c763e21ebdca5404e4cd60dfd0175f120b2a87b6 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "도움말"
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index f2feced5b53e709ea357e4b87df45f3737415a90..3fb247aa8474dd742785a07c5b0bf52b9ce78209 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -311,27 +272,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -340,7 +280,12 @@ msgstr ""
 msgid "Share"
 msgstr "هاوبەشی کردن"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "هه‌ڵه"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -372,7 +317,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "وشەی تێپەربو"
 
@@ -444,30 +389,58 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "ئاگاداری"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "زیادکردن"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -504,7 +477,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "ناوی به‌کارهێنه‌ر"
 
@@ -548,7 +521,7 @@ msgstr ""
 msgid "Users"
 msgstr "به‌كارهێنه‌ر"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "به‌رنامه‌كان"
 
@@ -560,6 +533,34 @@ msgstr "به‌ڕێوه‌به‌ری سه‌ره‌كی"
 msgid "Help"
 msgstr "یارمەتی"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -589,14 +590,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "زیادکردن"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -686,12 +679,12 @@ msgstr "كۆتایی هات ده‌ستكاریه‌كان"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "چوونەدەرەوە"
 
@@ -709,19 +702,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index 48f018b26b212a80720bd5f4a88faa02a5d7a71a..1870dc5439989f71ef1f61e2f762178e7a390159 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -74,15 +74,15 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr ""
 
@@ -90,36 +90,36 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr ""
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "هه‌ڵه"
 
@@ -131,7 +131,7 @@ msgstr "هاوبەشی کردن"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr ""
 
@@ -163,13 +163,13 @@ msgstr ""
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -226,25 +226,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "ناو"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr ""
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr ""
 
@@ -253,7 +253,7 @@ msgstr ""
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "بارکردن"
 
@@ -289,65 +289,65 @@ msgstr ""
 msgid "Save"
 msgstr "پاشکه‌وتکردن"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "بوخچه"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "داگرتن"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/ku_IQ/files_encryption.po b/l10n/ku_IQ/files_encryption.po
index e4a8591cc023f15217e0f6ae79a1feac602348c7..2aad92e04503429c303ff304598018bfe9408ff1 100644
--- a/l10n/ku_IQ/files_encryption.po
+++ b/l10n/ku_IQ/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "نهێنیکردن"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po
index d1abf7c6c827036a9720f1f75089a31cfe0e0a7e..8dea101c0080c54a03c331ecf50e32f11bec34e3 100644
--- a/l10n/ku_IQ/files_sharing.po
+++ b/l10n/ku_IQ/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "وشەی تێپەربو"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "ناردن"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s دابه‌شی کردووه‌ بوخچه‌ی %s له‌گه‌ڵ تۆ"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s دابه‌شی کردووه‌ په‌ڕگه‌یی %s له‌گه‌ڵ تۆ"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "داگرتن"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "بارکردن"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "هیچ پێشبینیه‌ك ئاماده‌ نیه بۆ"
diff --git a/l10n/ku_IQ/files_trashbin.po b/l10n/ku_IQ/files_trashbin.po
index c20783bf32d0a60382011d017cef34d8a031b4a5..85e8f58d3717643751d3f57c03a4e09686642d05 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -27,42 +27,10 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "هه‌ڵه"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr ""
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "ناو"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -71,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "ناو"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr ""
 
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index 5fb4b95ffae47a713b4c5de50e78e532dd4b2577..340611f80e9f1d76dea96b0af42e8e07ac31dedb 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "یارمەتی"
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index a823f86e026cc2b9cb3bd41de19e50afab6b627b..28c0c40335175d3df335a26e3624c7171f931db0 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -57,45 +57,6 @@ msgstr ""
 msgid "... %d%% done ..."
 msgstr ""
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Typ vun der Kategorie net uginn."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Keng Kategorie fir bäizesetzen?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Dës Kategorie existéiert schon: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Typ vum Objet net uginn."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID net uginn."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Feeler beim dobäisetze vun %s bei d'Favoritten."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Keng Kategorien ausgewielt fir ze läschen."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Feeler beim läsche vun %s aus de Favoritten."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -312,27 +273,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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 "Den Typ vum Object ass net uginn."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Feeler"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Den Numm vun der App ass net uginn."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "De benéidegte Fichier {file} ass net installéiert!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Gedeelt"
@@ -341,7 +281,12 @@ msgstr "Gedeelt"
 msgid "Share"
 msgstr "Deelen"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Feeler"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Feeler beim Deelen"
 
@@ -373,7 +318,7 @@ msgstr "Mat Link deelen"
 msgid "Password protect"
 msgstr "Passwuertgeschützt"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Passwuert"
 
@@ -445,30 +390,58 @@ msgstr "läschen"
 msgid "share"
 msgstr "deelen"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Passwuertgeschützt"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Feeler beim Läsche vum Verfallsdatum"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Feeler beim Setze vum Verfallsdatum"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Gëtt geschéckt..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Email geschéckt"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Warnung"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Den Typ vum Object ass net uginn."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Läschen"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Dobäisetzen"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -505,7 +478,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Du kriss e Link fir däi Passwuert zréckzesetze via Email geschéckt."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Benotzernumm"
 
@@ -549,7 +522,7 @@ msgstr "Perséinlech"
 msgid "Users"
 msgstr "Benotzer"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Applikatiounen"
 
@@ -561,6 +534,34 @@ msgstr "Admin"
 msgid "Help"
 msgstr "Hëllef"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Zougrëff net erlaabt"
@@ -590,14 +591,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Kategorien editéieren"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Dobäisetzen"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -687,12 +680,12 @@ msgstr "Installatioun ofschléissen"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ass verfügbar. Kréi méi Informatiounen doriwwer wéi d'Aktualiséierung ofleeft."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Ofmellen"
 
@@ -710,19 +703,27 @@ msgstr "Falls du däi Passwuert net viru kuerzem geännert hues, kéint däin Ac
 msgid "Please change your password to secure your account again."
 msgstr "Änner w.e.gl däi Passwuert fir däin Account nees ofzesécheren."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Passwuert vergiess?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "verhalen"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Umellen"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Alternativ Umeldungen"
 
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index e22efd6d0a159273f53037969ea9ed0a5bbe3723..4e750868aef1831777fe2ae4d846250ce82b2c90 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -74,15 +74,15 @@ msgstr "Konnt net op den Disk schreiwen"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr ""
 
@@ -90,36 +90,36 @@ msgstr ""
 msgid "Files"
 msgstr "Dateien"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr ""
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Upload ofgebrach."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Fehler"
 
@@ -131,7 +131,7 @@ msgstr "Deelen"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr ""
 
@@ -163,13 +163,13 @@ msgstr ""
 msgid "undo"
 msgstr "réckgängeg man"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -226,25 +226,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Numm"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Gréisst"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Geännert"
 
@@ -253,7 +253,7 @@ msgstr "Geännert"
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Eroplueden"
 
@@ -289,65 +289,65 @@ msgstr "Maximal Gréisst fir ZIP Fichieren"
 msgid "Save"
 msgstr "Späicheren"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nei"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Text Fichier"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Dossier"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Upload ofbriechen"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Hei ass näischt. Lued eppes rop!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Net méi deelen"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Läschen"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Upload ze grouss"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Fichieren gi gescannt, war weg."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Momentane Scan"
 
diff --git a/l10n/lb/files_encryption.po b/l10n/lb/files_encryption.po
index 4d829596aeaaa83120aa4d8b63640536e97aa49b..2852be04270a420046f8d552e12f9909165f7fc6 100644
--- a/l10n/lb/files_encryption.po
+++ b/l10n/lb/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index 3fba12cda24d0874476dbd6fc9d3064c9081beac..9b04cb82f481c5c4d513e03b7494b1bbc333f339 100644
--- a/l10n/lb/files_sharing.po
+++ b/l10n/lb/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "Den Passwuert ass incorrect. Probeier ed nach eng keier."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Passwuert"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Fortschécken"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -54,28 +54,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s huet den Dossier %s mad der gedeelt"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s deelt den Fichier %s mad dir"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Download"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Eroplueden"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Upload ofbriechen"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Keeng Preview do fir"
diff --git a/l10n/lb/files_trashbin.po b/l10n/lb/files_trashbin.po
index 85486bdbf470baa29a29ec53d8906cfb5149e938..12c2da94f61c74f6babe1f64dae0ee7f41a21d53 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -27,42 +27,10 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Fehler"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr ""
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Numm"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -71,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Numm"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Läschen"
 
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index 9fa58faf2f4ae2e42a6eff3836d387c4b2e58790..9dadffa0d687ca8de3ef700b45ad77cf5fcdd8e1 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Hëllef"
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 75a661131a5caefa3c0ee6aaf50af6fe98f6f736..4a6db82c7091eaf6d6b6cb305edfef5eba85e44d 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 19:10+0000\n"
-"Last-Translator: Liudas Ališauskas <liudas.alisauskas@gmail.com>\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,45 +60,6 @@ msgstr "Atnaujinta failų talpykla"
 msgid "... %d%% done ..."
 msgstr "... %d%% atlikta ..."
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Kategorija nenurodyta."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Nepridėsite jokios kategorijos?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Ši kategorija jau egzistuoja: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Objekto tipas nenurodytas."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID nenurodytas."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Klaida perkeliant %s į jūsų mėgstamiausius."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Trynimui nepasirinkta jokia kategorija."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Klaida ištrinant %s iš jūsų mėgstamiausius."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Nenurodytas paveikslėlis ar failas"
@@ -320,27 +281,6 @@ msgstr "({count} pažymėtų)"
 msgid "Error loading file exists template"
 msgstr "Klaida įkeliant esančių failų ruošinį"
 
-#: 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 "Objekto tipas nenurodytas."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Klaida"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Nenurodytas programos pavadinimas."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Reikalingas {file} failas nėra įrašytas!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Dalinamasi"
@@ -349,7 +289,12 @@ msgstr "Dalinamasi"
 msgid "Share"
 msgstr "Dalintis"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Klaida"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Klaida, dalijimosi metu"
 
@@ -381,7 +326,7 @@ msgstr "Dalintis nuoroda"
 msgid "Password protect"
 msgstr "Apsaugotas slaptažodžiu"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Slaptažodis"
 
@@ -453,30 +398,58 @@ msgstr "ištrinti"
 msgid "share"
 msgstr "dalintis"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Apsaugota slaptažodžiu"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Klaida nuimant galiojimo laiką"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Klaida nustatant galiojimo laiką"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Siunčiama..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Laiškas išsiųstas"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Įspėjimas"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Objekto tipas nenurodytas."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Ištrinti"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Pridėti"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -513,7 +486,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Prisijungimo vardas"
 
@@ -557,7 +530,7 @@ msgstr "Asmeniniai"
 msgid "Users"
 msgstr "Vartotojai"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Programos"
 
@@ -569,6 +542,34 @@ msgstr "Administravimas"
 msgid "Help"
 msgstr "Pagalba"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Priėjimas draudžiamas"
@@ -585,7 +586,7 @@ msgid ""
 "just letting you know that %s shared %s with you.\n"
 "View it: %s\n"
 "\n"
-msgstr ""
+msgstr "Labas,\n\nInformuojame, kad %s pasidalino su Jumis %s.\nPažiūrėti tai: %s\n"
 
 #: templates/altmail.php:4
 #, php-format
@@ -598,14 +599,6 @@ msgstr "Bendrinimo laikas baigsis %s.\n"
 msgid "Cheers!"
 msgstr "Sveikinimai!"
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Redaguoti kategorijas"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Pridėti"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -695,12 +688,12 @@ msgstr "Baigti diegimą"
 msgid "Finishing …"
 msgstr "Baigiama ..."
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimą."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Atsijungti"
 
@@ -718,19 +711,27 @@ msgstr "Jei paskutinių metu nekeitėte savo slaptažodžio, Jūsų paskyra gali
 msgid "Please change your password to secure your account again."
 msgstr "Prašome pasikeisti slaptažodį dar kartą, dėl paskyros saugumo."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Pamiršote slaptažodį?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "prisiminti"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Prisijungti"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Alternatyvūs prisijungimai"
 
@@ -739,7 +740,7 @@ msgstr "Alternatyvūs prisijungimai"
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>"
-msgstr ""
+msgstr "Labas,<br><br>tik informuojame, kad %s pasidalino su Jumis »%s«.<br><a href=\"%s\">Peržiūrėk!</a><br><br>"
 
 #: templates/mail.php:17
 #, php-format
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index dd86da635642a10b6ee38e8d0c1b7857a175d3e2..997e9298e460e1b24974b2682b19b215d60c5526 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 19:20+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+0000\n"
 "Last-Translator: Liudas Ališauskas <liudas.alisauskas@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -76,15 +76,15 @@ msgstr "Nepavyko įrašyti į diską"
 msgid "Not enough storage available"
 msgstr "Nepakanka vietos serveryje"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr "Įkėlimas nepavyko. Nepavyko gauti failo informacijos."
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Įkėlimas nepavyko. Nepavyko rasti įkelto failo"
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Neteisingas aplankas"
 
@@ -92,36 +92,36 @@ msgstr "Neteisingas aplankas"
 msgid "Files"
 msgstr "Failai"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Nepavyksta įkelti {filename}, nes tai katalogas arba yra 0 baitų dydžio"
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Nepakanka vietos"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Įkėlimas atšauktas."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr "Nepavyko gauti rezultato iš serverio."
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL negali būti tuščias."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Klaida"
 
@@ -133,7 +133,7 @@ msgstr "Dalintis"
 msgid "Delete permanently"
 msgstr "Ištrinti negrįžtamai"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Pervadinti"
 
@@ -165,14 +165,14 @@ msgstr "pakeiskite {new_name} į {old_name}"
 msgid "undo"
 msgstr "anuliuoti"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n aplankas"
 msgstr[1] "%n aplankai"
 msgstr[2] "%n aplankų"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n failas"
@@ -231,25 +231,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Šifravimas buvo išjungtas, bet Jūsų failai vis dar užšifruoti. Prašome eiti į asmeninius nustatymus ir iššifruoti savo failus."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Jūsų atsisiuntimas yra paruošiamas. tai gali užtrukti jei atsisiunčiamas didelis failas."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "Klaida perkeliant failą"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Dydis"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Pakeista"
 
@@ -258,7 +258,7 @@ msgstr "Pakeista"
 msgid "%s could not be renamed"
 msgstr "%s negali būti pervadintas"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Įkelti"
 
@@ -294,65 +294,65 @@ msgstr "Maksimalus ZIP archyvo failo dydis"
 msgid "Save"
 msgstr "Išsaugoti"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Naujas"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Teksto failas"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Katalogas"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Iš nuorodos"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Ištrinti failai"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Atšaukti siuntimą"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Jūs neturite rašymo leidimo."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Čia tuščia. Įkelkite ką nors!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Atsisiųsti"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Nebesidalinti"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Įkėlimui failas per didelis"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje"
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Skenuojami failai, prašome palaukti."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Šiuo metu skenuojama"
 
diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po
index b7bff08a70cd35b5873f533f640a246bec60c946..057734bb3313cf08d4c64ace001e01437ac6fc86 100644
--- a/l10n/lt_LT/files_encryption.po
+++ b/l10n/lt_LT/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -55,14 +55,14 @@ msgid ""
 "correct."
 msgstr "Nepavyko atnaujinti privataus rakto slaptažodžio. Gali būti, kad buvo neteisingai suvestas senasis."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
-msgstr ""
+msgstr "Šifravimo programa nepaleista! Galbūt šifravimo programa buvo įjungta dar kartą Jūsų sesijos metu. Prašome atsijungti ir vėl prisijungti, kad paleisti šifravimo programą."
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -70,6 +70,18 @@ msgid ""
 "files."
 msgstr "Jūsų privatus raktas yra netinkamas! Panašu, kad Jūsų slaptažodis buvo pakeistas išorėje ownCloud sistemos (pvz. Jūsų organizacijos kataloge). Galite atnaujinti savo privataus rakto slaptažodį savo asmeniniuose nustatymuose, kad atkurti prieigą prie savo šifruotų failų."
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "Trūkstami laukai."
@@ -81,7 +93,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Prašome įsitikinti, kad PHP 5.3.3 ar naujesnė yra įdiegta ir kad OpenSSL kartu su PHP plėtiniu yra šjungti ir teisingai sukonfigūruoti. Kol kas šifravimo programa bus išjungta."
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "Sekantys naudotojai nenustatyti šifravimui:"
 
@@ -91,97 +103,97 @@ msgstr "Saugoma..."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
-msgstr ""
+msgstr "Eiti tiesiai į Jūsų"
 
 #: templates/invalid_private_key.php:8
 msgid "personal settings"
 msgstr "asmeniniai nustatymai"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Šifravimas"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Įjunkite atkūrimo raktą, (leisti atkurti naudotojų failus praradus slaptažodį):"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "Atkūrimo rakto slaptažodis"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
-msgstr ""
+msgstr "Pakartokite atkūrimo rakto slaptažodį"
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Įjungta"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Išjungta"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "Pakeisti atkūrimo rakto slaptažodį:"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "Senas atkūrimo rakto slaptažodis"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "Naujas atkūrimo rakto slaptažodis"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
-msgstr ""
+msgstr "Pakartokite naują atkūrimo rakto slaptažodį"
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Pakeisti slaptažodį"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Privatus rakto slaptažodis daugiau neatitinka Jūsų prisijungimo slaptažodžio:"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "Nustatyti Jūsų privataus rakto slaptažodį į Jūsų dabartinį prisijungimo."
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Jei nepamenate savo seno slaptažodžio, galite paprašyti administratoriaus atkurti Jūsų failus."
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Senas prisijungimo slaptažodis"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Dabartinis prisijungimo slaptažodis"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "Atnaujinti privataus rakto slaptažodį"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Įjungti slaptažodžio atkūrimą:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Įjungus šią funkciją jums bus suteiktas pakartotinis priėjimas prie Jūsų šifruotų failų pamiršus slaptažodį."
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "Failų atkūrimo nustatymai pakeisti"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "Neišėjo atnaujinti failų atkūrimo"
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index 1ce65e7a0668fa03fb58a8d4d13bd9bc07bd3e75..46715d4e97d599e50c42259de8dbcafd3aa1c177 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/files_sharing.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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
-"Last-Translator: Liudas Ališauskas <liudas.alisauskas@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,17 +20,17 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "Netinka slaptažodis: Bandykite dar kartą."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Išsaugoti"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Atleiskite, panašu, kad nuoroda yra neveiksni."
@@ -55,28 +55,28 @@ msgstr "dalinimasis yra išjungtas"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Dėl tikslesnės informacijos susisiekite su asmeniu atsiuntusiu nuorodą."
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s pasidalino su jumis %s aplanku"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s pasidalino su jumis %s failu"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Atsisiųsti"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Įkelti"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Atšaukti siuntimą"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Peržiūra nėra galima"
diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po
index 3f4887ea23f9ce2c80888c4c8d6cd4e247e63133..3e1f7188d2f81020712929ac8d434f8f11b66713 100644
--- a/l10n/lt_LT/files_trashbin.po
+++ b/l10n/lt_LT/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: Liudas Ališauskas <liudas.alisauskas@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,44 +29,10 @@ msgstr "Nepavyko negrįžtamai ištrinti %s"
 msgid "Couldn't restore %s"
 msgstr "Nepavyko atkurti %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "atkurti"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Klaida"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "failą ištrinti negrįžtamai"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Ištrinti negrįžtamai"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Pavadinimas"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Ištrinti"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] "%n aplankų"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] "%n failų"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "atstatyta"
@@ -75,11 +41,19 @@ msgstr "atstatyta"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Nieko nėra. Jūsų šiukšliadėžė tuščia!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Pavadinimas"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Atstatyti"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Ištrinti"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Ištrinti"
 
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 4890efbe3b04ee9b1f29eef052363dc7c0519a60..e5393ac3794c49bcbe72022b4c7d8c43102ba360 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: Liudas Ališauskas <liudas.alisauskas@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -369,14 +369,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "UUID atributas:"
+msgid "UUID Attribute for Users:"
+msgstr ""
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "Naudotojo vardo - LDAP naudotojo sąsaja"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -390,18 +394,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Išvalyti naudotojo vardo - LDAP naudotojo sąsają"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Išvalyti grupės pavadinimo - LDAP naudotojo sąsają"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Bandyti konfigūraciją"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Pagalba"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 357116629875a41c68fc438b5a4c1645ee71e6c1..a3608479fc042966d6d6c1c7291035803668fa5e 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -57,45 +57,6 @@ msgstr ""
 msgid "... %d%% done ..."
 msgstr ""
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Kategorijas tips nav norādīts."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Nav kategoriju, ko pievienot?"
-
-#: ajax/vcategories/add.php:37
-#, 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
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Objekta tips nav norādīts."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID nav norādīts."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Kļūda, pievienojot %s izlasei."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Neviena kategorija nav izvēlēta dzēšanai."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Kļūda, izņemot %s no izlases."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -317,27 +278,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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 "Nav norādīts objekta tips."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Kļūda"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Nav norādīts lietotnes nosaukums."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Pieprasītā datne {file} nav instalēta!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Kopīgs"
@@ -346,7 +286,12 @@ msgstr "Kopīgs"
 msgid "Share"
 msgstr "Dalīties"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Kļūda"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Kļūda, daloties"
 
@@ -378,7 +323,7 @@ msgstr "Dalīties ar saiti"
 msgid "Password protect"
 msgstr "Aizsargāt ar paroli"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Parole"
 
@@ -450,30 +395,58 @@ msgstr "dzēst"
 msgid "share"
 msgstr "dalīties"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Aizsargāts ar paroli"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Kļūda, noņemot termiņa datumu"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Kļūda, iestatot termiņa datumu"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Sūta..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Vēstule nosūtīta"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Brīdinājums"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Nav norādīts objekta tips."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Dzēst"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Pievienot"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -510,7 +483,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Lietotājvārds"
 
@@ -554,7 +527,7 @@ msgstr "Personīgi"
 msgid "Users"
 msgstr "Lietotāji"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Lietotnes"
 
@@ -566,6 +539,34 @@ msgstr "Administratori"
 msgid "Help"
 msgstr "Palīdzība"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Pieeja ir liegta"
@@ -595,14 +596,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Rediģēt kategoriju"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Pievienot"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -692,12 +685,12 @@ msgstr "Pabeigt iestatīšanu"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ir pieejams. Uzziniet vairāk kā atjaunināt."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Izrakstīties"
 
@@ -715,19 +708,27 @@ msgstr "Ja neesat pēdējā laikā mainījis paroli, iespējams, ka jūsu konts
 msgid "Please change your password to secure your account again."
 msgstr "Lūdzu, nomainiet savu paroli, lai atkal nodrošinātu savu kontu."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Aizmirsāt paroli?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "atcerēties"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Ierakstīties"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Alternatīvās pieteikšanās"
 
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index 97b5ad594227fdef64d4003c0eca7b09301c96a2..991b5a970313143b1fe8182296160272cf41aded 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -75,15 +75,15 @@ msgstr "Neizdevās saglabāt diskā"
 msgid "Not enough storage available"
 msgstr "Nav pietiekami daudz vietas"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Nederīga direktorija."
 
@@ -91,36 +91,36 @@ msgstr "Nederīga direktorija."
 msgid "Files"
 msgstr "Datnes"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Nepietiek brīvas vietas"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Augšupielāde ir atcelta."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL nevar būt tukšs."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Kļūdains mapes nosaukums. 'Shared' lietošana ir rezervēta no ownCloud"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Kļūda"
 
@@ -132,7 +132,7 @@ msgstr "Dalīties"
 msgid "Delete permanently"
 msgstr "Dzēst pavisam"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Pārsaukt"
 
@@ -164,14 +164,14 @@ msgstr "aizvietoja {new_name} ar {old_name}"
 msgid "undo"
 msgstr "atsaukt"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mapes"
 msgstr[1] "%n mape"
 msgstr[2] "%n mapes"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n faili"
@@ -230,25 +230,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Šifrēšana tika atslēgta, tomēr jūsu faili joprojām ir šifrēti. Atšifrēt failus var Personiskajos uzstādījumos."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Tiek sagatavota lejupielāde. Tas var aizņemt kādu laiciņu, ja datnes ir lielas."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Nosaukums"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Izmērs"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Mainīts"
 
@@ -257,7 +257,7 @@ msgstr "Mainīts"
 msgid "%s could not be renamed"
 msgstr "%s nevar tikt pārsaukts"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Augšupielādēt"
 
@@ -293,65 +293,65 @@ msgstr "Maksimālais ievades izmērs ZIP datnēm"
 msgid "Save"
 msgstr "Saglabāt"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Jauna"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Teksta datne"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Mape"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "No saites"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Dzēstās datnes"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Atcelt augšupielādi"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Jums nav tiesību šeit rakstīt."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Te vēl nekas nav. Rīkojies, sāc augšupielādēt!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Lejupielādēt"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Pārtraukt dalīšanos"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Dzēst"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Datne ir par lielu, lai to augšupielādētu"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu"
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Šobrīd tiek caurskatīts"
 
diff --git a/l10n/lv/files_encryption.po b/l10n/lv/files_encryption.po
index 3e83a2065ca155bff847f942f87e9216af5bae2a..df81c4ab04b8854b280745baf285af546cb346e6 100644
--- a/l10n/lv/files_encryption.po
+++ b/l10n/lv/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Šifrēšana"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index 036cfaf96077f4a57cf0334080a952f15837c59e..2284ca1c98452c28e42334e38d19408aaa63b5c5 100644
--- a/l10n/lv/files_sharing.po
+++ b/l10n/lv/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -18,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Parole"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Iesniegt"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ar jums dalījās ar mapi %s"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ar jums dalījās ar datni %s"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Lejupielādēt"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Augšupielādēt"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Atcelt augšupielādi"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Nav pieejams priekšskatījums priekš"
diff --git a/l10n/lv/files_trashbin.po b/l10n/lv/files_trashbin.po
index 8409f8c920818324b17be1a72dcab2ce9aea83e6..5792cb5d368d6a5bceb80333bd2abe1d8daa300b 100644
--- a/l10n/lv/files_trashbin.po
+++ b/l10n/lv/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: stendec <stendec@inbox.lv>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -28,44 +28,10 @@ msgstr "Nevarēja pilnībā izdzēst %s"
 msgid "Couldn't restore %s"
 msgstr "Nevarēja atjaunot %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "veikt atjaunošanu"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Kļūda"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "dzēst datni pavisam"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Dzēst pavisam"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Nosaukums"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Dzēsts"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "Nekas, %n mapes"
-msgstr[1] "%n mape"
-msgstr[2] "%n mapes"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "Neviens! %n faaili"
-msgstr[1] "%n fails"
-msgstr[2] "%n faili"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "atjaunots"
@@ -74,11 +40,19 @@ msgstr "atjaunots"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Šeit nekā nav. Jūsu miskaste ir tukša!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Nosaukums"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Atjaunot"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Dzēsts"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Dzēst"
 
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 18c16618b64c95814d33e2f4406197cd9d126aab..c3b629b818d62b035b3ae8c5d52d2f239b3cd9ff 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Testa konfigurācija"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Palīdzība"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 969d919a8cd70e70dad38c996712a7f15131fba9..635c4d5788e5acc8f701884858d6e8cc5c3cc8f1 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# miroj <jmiroslav@softhome.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -41,7 +42,7 @@ msgstr ""
 
 #: ajax/update.php:17
 msgid "Updated database"
-msgstr ""
+msgstr "Базата е надградена"
 
 #: ajax/update.php:20
 msgid "Updating filecache, this may take really long..."
@@ -49,52 +50,13 @@ msgstr ""
 
 #: ajax/update.php:23
 msgid "Updated filecache"
-msgstr ""
+msgstr "Кешот е надграден"
 
 #: ajax/update.php:26
 #, php-format
 msgid "... %d%% done ..."
 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 "%s ID не беше доставено."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Грешка при додавање %s во омилени."
-
-#: 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 "Грешка при бришење на %s од омилени."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -105,7 +67,7 @@ msgstr ""
 
 #: avatar/controller.php:85
 msgid "Invalid image"
-msgstr ""
+msgstr "Невалидна фотографија"
 
 #: avatar/controller.php:115 avatar/controller.php:142
 msgid "No temporary profile picture available, try again"
@@ -297,50 +259,34 @@ msgstr "Откажи"
 
 #: js/oc-dialogs.js:386
 msgid "Continue"
-msgstr ""
+msgstr "Продолжи"
 
 #: js/oc-dialogs.js:433 js/oc-dialogs.js:446
 msgid "(all selected)"
-msgstr ""
+msgstr "(сите одбрани)"
 
 #: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "({count} selected)"
-msgstr ""
+msgstr "({count} одбраните)"
 
 #: js/oc-dialogs.js:457
 msgid "Error loading file exists template"
-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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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 "Задолжителната датотека {file} не е инсталирана!"
+msgstr "Грешка при вчитување на датотеката, шаблонот постои "
 
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
-msgstr ""
+msgstr "Споделен"
 
 #: js/share.js:90
 msgid "Share"
 msgstr "Сподели"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Грешка"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Грешка при споделување"
 
@@ -372,13 +318,13 @@ msgstr "Сподели со врска"
 msgid "Password protect"
 msgstr "Заштити со лозинка"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Лозинка"
 
 #: js/share.js:199
 msgid "Allow Public Upload"
-msgstr ""
+msgstr "Дозволи јавен аплоуд"
 
 #: js/share.js:203
 msgid "Email link to person"
@@ -418,7 +364,7 @@ msgstr "Не споделувај"
 
 #: js/share.js:353
 msgid "notify user by email"
-msgstr ""
+msgstr "извести го корисникот преку електронска пошта"
 
 #: js/share.js:361
 msgid "can edit"
@@ -444,45 +390,73 @@ msgstr "избриши"
 msgid "share"
 msgstr "сподели"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Заштитено со лозинка"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Грешка при тргање на рокот на траење"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Грешка при поставување на рок на траење"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Праќање..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Е-порака пратена"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Предупредување"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Не е специфициран типот на објект."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Избриши"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Додади"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 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 community</a>."
 
 #: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud."
 
 #: lostpassword/controller.php:62
 #, php-format
 msgid "%s password reset"
-msgstr ""
+msgstr "%s ресетирање на лозинката"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -504,7 +478,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Корисничко име"
 
@@ -518,7 +492,7 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Да, јас сега навистина сакам да ја поништам својата лозинка"
 
 #: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
@@ -548,7 +522,7 @@ msgstr "Лично"
 msgid "Users"
 msgstr "Корисници"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Аппликации"
 
@@ -560,6 +534,34 @@ msgstr "Админ"
 msgid "Help"
 msgstr "Помош"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Забранет пристап"
@@ -576,26 +578,18 @@ msgid ""
 "just letting you know that %s shared %s with you.\n"
 "View it: %s\n"
 "\n"
-msgstr ""
+msgstr "Здраво,\n\nСамо да ве известам дека  %s shared %s with you.\nView it: %s\n\n"
 
 #: templates/altmail.php:4
 #, php-format
 msgid ""
 "The share will expire on %s.\n"
 "\n"
-msgstr ""
+msgstr "Споделувањето ќе заврши на %s.\n\n"
 
 #: templates/altmail.php:6 templates/mail.php:19
 msgid "Cheers!"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Уреди категории"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Додади"
+msgstr "Поздрав!"
 
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
@@ -604,7 +598,7 @@ msgstr "Безбедносно предупредување"
 
 #: templates/installation.php:25
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
+msgstr "Вашата верзија на PHP е ранлива на NULL Byte attack (CVE-2006-7243)"
 
 #: templates/installation.php:26
 #, php-format
@@ -627,7 +621,7 @@ msgstr "Без сигурен генератор на случајни брое
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr ""
+msgstr "Вашиот директориум со податоци и датотеки се веројатно достапни преку интенернт поради што .htaccess датотеката не функционира."
 
 #: templates/installation.php:41
 #, php-format
@@ -684,14 +678,14 @@ msgstr "Заврши го подесувањето"
 
 #: templates/installation.php:184
 msgid "Finishing …"
-msgstr ""
+msgstr "Завршувам ..."
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Одјава"
 
@@ -709,21 +703,29 @@ msgstr "Ако не сте ја промениле лозинката во ск
 msgid "Please change your password to secure your account again."
 msgstr "Ве молам сменете ја лозинката да ја обезбедите вашата сметка повторно."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr "Ве молиме контактирајте го вашиот администратор."
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Ја заборавивте лозинката?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "запамти"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Најава"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
-msgstr ""
+msgstr "Алтернативни најавувања"
 
 #: templates/mail.php:15
 #, php-format
@@ -740,4 +742,4 @@ msgstr ""
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
+msgstr "Надградбата на ownCloud на верзијата %s, може да потрае."
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index afd9ab3b46c3b8a31264327c90c1cf2e677c5477..45dc0e167c0ac2fe0928a56241fc96ec70e667f6 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -74,15 +74,15 @@ msgstr "Неуспеав да запишам на диск"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr ""
 
@@ -90,36 +90,36 @@ msgstr ""
 msgid "Files"
 msgstr "Датотеки"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr ""
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Преземањето е прекинато."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "Адресата неможе да биде празна."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Грешка"
 
@@ -131,7 +131,7 @@ msgstr "Сподели"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Преименувај"
 
@@ -163,13 +163,13 @@ msgstr "заменета {new_name} со {old_name}"
 msgid "undo"
 msgstr "врати"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -226,25 +226,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Големина"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Променето"
 
@@ -253,7 +253,7 @@ msgstr "Променето"
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Подигни"
 
@@ -289,65 +289,65 @@ msgstr "Максимална големина за внес на ZIP датот
 msgid "Save"
 msgstr "Сними"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Ново"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Текстуална датотека"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Папка"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Од врска"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Откажи прикачување"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Тука нема ништо. Снимете нешто!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Преземи"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Не споделувај"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Избриши"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Фајлот кој се вчитува е преголем"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Се скенираат датотеки, ве молам почекајте."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Моментално скенирам"
 
diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po
index cc367d9bbf23f0ad8cecc0c370d525673601d7ee..4ba0810f3e1aeb755a1afa0d5f20884609a74f17 100644
--- a/l10n/mk/files_encryption.po
+++ b/l10n/mk/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Енкрипција"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index 97b8547bc7789e10c89222e301cf07184b249cf9..1c77aa43716d0208b23f3136cd15eaeb4ae245da 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Прати"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ја сподели папката %s со Вас"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ја сподели датотеката %s со Вас"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Преземи"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Подигни"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Откажи прикачување"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Нема достапно преглед за"
diff --git a/l10n/mk/files_trashbin.po b/l10n/mk/files_trashbin.po
index 7e028cbe6f5f103b14894e87ac2461dc1f7fc5fb..3d784eb2470833945c37b69e31df94d475caee9c 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -27,42 +27,10 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Грешка"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr ""
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Име"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -71,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Име"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Избриши"
 
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index 8b7a7df882608915a165f5e96293fc939e5b141d..cc59cb6e649c2ab5bcceca49d7683ad44536b1e7 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
+"POT-Creation-Date: 2013-10-08 07:21-0400\n"
+"PO-Revision-Date: 2013-10-07 21:00+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"
@@ -63,7 +63,7 @@ msgstr ""
 
 #: private/avatar.php:69
 msgid "Invalid image"
-msgstr ""
+msgstr "Невалидна фотографија"
 
 #: private/defaults.php:36
 msgid "web services under your control"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 17598ec84879bf1eb0113d7c36ade8a0c6c78240..954528d7374ed289e5c5ef990a45c1a1077b7dd3 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# miroj <jmiroslav@softhome.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-08 07:22-0400\n"
+"PO-Revision-Date: 2013-10-07 20:40+0000\n"
+"Last-Translator: miroj <jmiroslav@softhome.net>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,11 +29,11 @@ msgstr "Грешка во автентикација"
 
 #: ajax/changedisplayname.php:31
 msgid "Your display name has been changed."
-msgstr ""
+msgstr "Вашето прикажано име се промени."
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
-msgstr ""
+msgstr "Не можам да го сменам прикажанато име"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
@@ -82,7 +83,7 @@ msgstr "Неможе да избришам корисник од група %s"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr ""
+msgstr "Не можам да ја надградам апликацијата."
 
 #: changepassword/controller.php:20
 msgid "Wrong password"
@@ -115,7 +116,7 @@ msgstr ""
 
 #: js/apps.js:43
 msgid "Update to {appversion}"
-msgstr ""
+msgstr "Надгради на {appversion}"
 
 #: js/apps.js:49 js/apps.js:82 js/apps.js:110
 msgid "Disable"
@@ -127,7 +128,7 @@ msgstr "Овозможи"
 
 #: js/apps.js:71
 msgid "Please wait...."
-msgstr ""
+msgstr "Ве молам почекајте ..."
 
 #: js/apps.js:79 js/apps.js:80 js/apps.js:101
 msgid "Error while disabling app"
@@ -139,11 +140,11 @@ msgstr ""
 
 #: js/apps.js:125
 msgid "Updating...."
-msgstr ""
+msgstr "Надградувам ..."
 
 #: js/apps.js:128
 msgid "Error while updating app"
-msgstr ""
+msgstr "Грешка додека ја надградувам апликацијата"
 
 #: js/apps.js:128
 msgid "Error"
@@ -155,7 +156,7 @@ msgstr "Ажурирај"
 
 #: js/apps.js:132
 msgid "Updated"
-msgstr ""
+msgstr "Надграден"
 
 #: js/personal.js:225
 msgid "Select a profile picture"
@@ -171,7 +172,7 @@ msgstr "Снимам..."
 
 #: js/users.js:47
 msgid "deleted"
-msgstr ""
+msgstr "избришан"
 
 #: js/users.js:47
 msgid "undo"
@@ -179,36 +180,36 @@ msgstr "врати"
 
 #: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Не можам да го одстранам корисникот"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: js/users.js:95 templates/users.php:26 templates/users.php:90
 #: templates/users.php:118
 msgid "Groups"
 msgstr "Групи"
 
-#: js/users.js:97 templates/users.php:92 templates/users.php:130
+#: js/users.js:100 templates/users.php:92 templates/users.php:130
 msgid "Group Admin"
 msgstr "Администратор на група"
 
-#: js/users.js:120 templates/users.php:170
+#: js/users.js:123 templates/users.php:170
 msgid "Delete"
 msgstr "Избриши"
 
-#: js/users.js:277
+#: js/users.js:280
 msgid "add group"
-msgstr ""
+msgstr "додади група"
 
-#: js/users.js:436
+#: js/users.js:442
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Мора да се обезбеди валидно корисничко име "
 
-#: js/users.js:437 js/users.js:443 js/users.js:458
+#: js/users.js:443 js/users.js:449 js/users.js:464
 msgid "Error creating user"
-msgstr ""
+msgstr "Грешка при креирање на корисникот"
 
-#: js/users.js:442
+#: js/users.js:448
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Мора да се обезбеди валидна лозинка"
 
 #: personal.php:45 personal.php:46
 msgid "__language_name__"
@@ -229,7 +230,7 @@ msgstr ""
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr ""
+msgstr "Предупредување при подесување"
 
 #: templates/admin.php:32
 msgid ""
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 63b1000bf6e66c813a8736caa555aee86daf2f20..fa9398edec7a3a6c28925431ef6455733c81a7d0 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Помош"
diff --git a/l10n/mk/user_webdavauth.po b/l10n/mk/user_webdavauth.po
index 0de649364a4420829a20ace85b89c4a627e4ff05..613044a3e8e155beb55b51b739fa1bd24eb2b586 100644
--- a/l10n/mk/user_webdavauth.po
+++ b/l10n/mk/user_webdavauth.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Georgi Stanojevski <glisha@gmail.com>, 2012
+# miroj <jmiroslav@softhome.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-08 07:20-0400\n"
+"PO-Revision-Date: 2013-10-07 20:10+0000\n"
+"Last-Translator: miroj <jmiroslav@softhome.net>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +25,7 @@ msgstr ""
 
 #: templates/settings.php:4
 msgid "Address: "
-msgstr ""
+msgstr "Адреса:"
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/ml_IN/core.po b/l10n/ml_IN/core.po
index ded8b3e235df6133eabcfe3d99d5d045840668c1..a625898b871424d0f205ad5919fe50b11f895d9c 100644
--- a/l10n/ml_IN/core.po
+++ b/l10n/ml_IN/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -311,27 +272,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -340,7 +280,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr ""
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -372,7 +317,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr ""
 
@@ -444,30 +389,58 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -504,7 +477,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr ""
 
@@ -548,7 +521,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr ""
 
@@ -560,6 +533,34 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -589,14 +590,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr ""
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -686,12 +679,12 @@ msgstr ""
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr ""
 
@@ -709,19 +702,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ml_IN/files_encryption.po b/l10n/ml_IN/files_encryption.po
index 3339f6b3cdfc29700fbeda016c0c294b995c585b..dee006ceb6b607c86744b9c5be46b6c17569c10c 100644
--- a/l10n/ml_IN/files_encryption.po
+++ b/l10n/ml_IN/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ml_IN/files_sharing.po b/l10n/ml_IN/files_sharing.po
index 088c381190f8fd809ad0eb7de5c8692b2f28183d..0924709dcb482810da34da24a1fe7f98d58a30c4 100644
--- a/l10n/ml_IN/files_sharing.po
+++ b/l10n/ml_IN/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-07-31 01:55-0400\n"
-"PO-Revision-Date: 2013-07-31 05:56+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
-msgid "Password"
+msgid "The password is wrong. Try again."
 msgstr ""
 
-#: templates/authenticate.php:9
-msgid "Submit"
+#: templates/authenticate.php:10
+msgid "Password"
 msgstr ""
 
 #: templates/part.404.php:3
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:85
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/ml_IN/files_trashbin.po b/l10n/ml_IN/files_trashbin.po
index 42c24ca6423edb0e5e6c6f11a0880c5362ca2980..f75561f8522e7512a605e4559cf5616bacc766a4 100644
--- a/l10n/ml_IN/files_trashbin.po
+++ b/l10n/ml_IN/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-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -27,55 +27,31 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:100
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:36
-msgid "delete file permanently"
+#: lib/trashbin.php:814 lib/trashbin.php:816
+msgid "restored"
 msgstr ""
 
-#: js/trash.js:127
-msgid "Delete permanently"
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: js/trash.js:182 templates/index.php:17
+#: templates/index.php:23
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:183 templates/index.php:27
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:191
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:197
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/trash.php:819 lib/trash.php:821
-msgid "restored"
-msgstr ""
-
-#: templates/index.php:9
-msgid "Nothing in here. Your trash bin is empty!"
+#: templates/index.php:26 templates/index.php:28
+msgid "Restore"
 msgstr ""
 
-#: templates/index.php:20 templates/index.php:22
-msgid "Restore"
+#: templates/index.php:34
+msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:30 templates/index.php:31
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr ""
 
diff --git a/l10n/ml_IN/user_ldap.po b/l10n/ml_IN/user_ldap.po
index a7b06da5286ece45832f786b9a7e094e754e4fe9..c96aa269c63b93490c048afa6c37b652370ed08e 100644
--- a/l10n/ml_IN/user_ldap.po
+++ b/l10n/ml_IN/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:36
+#: ajax/testConfiguration.php:37
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:39
+#: ajax/testConfiguration.php:40
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:43
+#: ajax/testConfiguration.php:44
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 94bd3ed5fbd73008e9167325a1078990233c6dda..99bda85fd8bb374bebabf7fa0429d5fbf77a586d 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 "Tiada kategori untuk di tambah?"
-
-#: 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 "Tiada kategori dipilih untuk dibuang."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -306,27 +267,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Ralat"
-
-#: 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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -335,7 +275,12 @@ msgstr ""
 msgid "Share"
 msgstr "Kongsi"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Ralat"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -367,7 +312,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Kata laluan"
 
@@ -439,30 +384,58 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Amaran"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Padam"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Tambah"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -499,7 +472,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel"
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Nama pengguna"
 
@@ -543,7 +516,7 @@ msgstr "Peribadi"
 msgid "Users"
 msgstr "Pengguna"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Aplikasi"
 
@@ -555,6 +528,34 @@ msgstr "Admin"
 msgid "Help"
 msgstr "Bantuan"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Larangan akses"
@@ -584,14 +585,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Ubah kategori"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Tambah"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -681,12 +674,12 @@ msgstr "Setup selesai"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Log keluar"
 
@@ -704,19 +697,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Hilang kata laluan?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "ingat"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Log masuk"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index e938191475445569f37051b21c685d6c96b460e2..5b30b3c3ff5048aa9a5b2aa2003019f4892947fd 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -74,15 +74,15 @@ msgstr "Gagal untuk disimpan"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr ""
 
@@ -90,36 +90,36 @@ msgstr ""
 msgid "Files"
 msgstr "Fail-fail"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr ""
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Muatnaik dibatalkan."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Ralat"
 
@@ -131,7 +131,7 @@ msgstr "Kongsi"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr ""
 
@@ -163,12 +163,12 @@ msgstr ""
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -223,25 +223,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Saiz"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Dimodifikasi"
 
@@ -250,7 +250,7 @@ msgstr "Dimodifikasi"
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Muat naik"
 
@@ -286,65 +286,65 @@ msgstr "Saiz maksimum input untuk fail ZIP"
 msgid "Save"
 msgstr "Simpan"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Baru"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Fail teks"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Folder"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Batal muat naik"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Tiada apa-apa di sini. Muat naik sesuatu!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Muat turun"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Padam"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Muatnaik terlalu besar"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server"
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Fail sedang diimbas, harap bersabar."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Imbasan semasa"
 
diff --git a/l10n/ms_MY/files_encryption.po b/l10n/ms_MY/files_encryption.po
index 419dc03f3909d22ba7dac46271628072f4a41f7a..fa779dacb0ca2224f4db6f0310b0e4608612699e 100644
--- a/l10n/ms_MY/files_encryption.po
+++ b/l10n/ms_MY/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index 67cf9aabfb3743efa0add93d65eeb3fe58b557ff..88f8f2364decd02abea6986cea2863243250cce8 100644
--- a/l10n/ms_MY/files_sharing.po
+++ b/l10n/ms_MY/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -18,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Kata laluan"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Hantar"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Muat turun"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Muat naik"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Batal muat naik"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/ms_MY/files_trashbin.po b/l10n/ms_MY/files_trashbin.po
index f65679fc8ef5a13e2c035a2011a9eac2dbdf8d17..3e3725af5d1859860506809d0088207770edd2dd 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -27,40 +27,10 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Ralat"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr ""
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Nama"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -69,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Nama"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Padam"
 
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index 2a6f3630a053ee2181e32cf0050698c21a23be57..0b1daaf6b69d86ee0919b3314feebbf12e891927 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Bantuan"
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index 5cb83560089dd09ab54596cd0e1d7c21e3a51082..ad9f32b13ab9edb848fbc933b352bec292cf6a88 100644
--- a/l10n/my_MM/core.po
+++ b/l10n/my_MM/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -306,27 +267,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -335,7 +275,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr ""
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -367,7 +312,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "စကားဝှက်"
 
@@ -439,30 +384,58 @@ msgstr "ဖျက်မည်"
 msgid "share"
 msgstr "ဝေမျှမည်"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "ပေါင်းထည့်"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -499,7 +472,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။"
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "သုံးစွဲသူအမည်"
 
@@ -543,7 +516,7 @@ msgstr ""
 msgid "Users"
 msgstr "သုံးစွဲသူ"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Apps"
 
@@ -555,6 +528,34 @@ msgstr "အက်ဒမင်"
 msgid "Help"
 msgstr "အကူအညီ"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -584,14 +585,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "ပေါင်းထည့်"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -681,12 +674,12 @@ msgstr "တပ်ဆင်ခြင်းပြီးပါပြီ။"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr ""
 
@@ -704,19 +697,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "သင်၏စကားဝှက်ပျောက်သွားပြီလား။"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "မှတ်မိစေသည်"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "ဝင်ရောက်ရန်"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/my_MM/files_encryption.po b/l10n/my_MM/files_encryption.po
index f51e1ab1dad3801f40265c579482f9e4fef65e1c..decfa7530cea9163d3d2dd79cdfa169e8fe04679 100644
--- a/l10n/my_MM/files_encryption.po
+++ b/l10n/my_MM/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po
index 6b5c6c97692d1e1f957f0a504b975f4e0d986b4f..90a31483730c8d56c6ba9a5a57f4091cc6bf89fe 100644
--- a/l10n/my_MM/files_sharing.po
+++ b/l10n/my_MM/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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -18,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "စကားဝှက်"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "ထည့်သွင်းမည်"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "ဒေါင်းလုတ်"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/my_MM/files_trashbin.po b/l10n/my_MM/files_trashbin.po
index 0611fe45b555f8ea10a8749fc34243defa93c792..dee62ffcf4ea02f6d3f1f5a4b04c5491e82388ad 100644
--- a/l10n/my_MM/files_trashbin.po
+++ b/l10n/my_MM/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-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -27,53 +27,31 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:100
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:36
-msgid "delete file permanently"
+#: lib/trashbin.php:814 lib/trashbin.php:816
+msgid "restored"
 msgstr ""
 
-#: js/trash.js:127
-msgid "Delete permanently"
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: js/trash.js:182 templates/index.php:17
+#: templates/index.php:23
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:183 templates/index.php:27
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:191
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/trash.js:197
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
-#: lib/trash.php:819 lib/trash.php:821
-msgid "restored"
-msgstr ""
-
-#: templates/index.php:9
-msgid "Nothing in here. Your trash bin is empty!"
+#: templates/index.php:26 templates/index.php:28
+msgid "Restore"
 msgstr ""
 
-#: templates/index.php:20 templates/index.php:22
-msgid "Restore"
+#: templates/index.php:34
+msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:30 templates/index.php:31
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr ""
 
diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po
index b68d9912df8231db443eced09db50aff51b8f73c..31381520c3a05a7849360d21d731f622420dc1d3 100644
--- a/l10n/my_MM/user_ldap.po
+++ b/l10n/my_MM/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "အကူအညီ"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 742669f8c4ce7b32bf98d5fffc26a0f5c9c93d45..5edf0d17cb1fed499c0246fd490c2557def617f1 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -57,45 +57,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 "Ingen kategorier å legge til?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Denne kategorien finnes allerede: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr ""
-
-#: 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 "Ingen kategorier merket for sletting."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -312,27 +273,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Feil"
-
-#: 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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Delt"
@@ -341,7 +281,12 @@ msgstr "Delt"
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Feil"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Feil under deling"
 
@@ -373,7 +318,7 @@ msgstr "Del med link"
 msgid "Password protect"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Passord"
 
@@ -445,30 +390,58 @@ msgstr "slett"
 msgid "share"
 msgstr "del"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Kan ikke sette utløpsdato"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Sender..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "E-post sendt"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Advarsel"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Slett"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Legg til"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -505,7 +478,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Du burde motta detaljer om å tilbakestille passordet ditt via epost."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Brukernavn"
 
@@ -549,7 +522,7 @@ msgstr "Personlig"
 msgid "Users"
 msgstr "Brukere"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Apper"
 
@@ -561,6 +534,34 @@ msgstr "Admin"
 msgid "Help"
 msgstr "Hjelp"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Tilgang nektet"
@@ -590,14 +591,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Rediger kategorier"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Legg til"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -687,12 +680,12 @@ msgstr "Fullfør oppsetting"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Logg ut"
 
@@ -710,19 +703,27 @@ msgstr "Hvis du ikke har endret passordet ditt nylig kan kontoen din være kompr
 msgid "Please change your password to secure your account again."
 msgstr "Vennligst skift passord for å gjøre kontoen din sikker igjen."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Mistet passordet ditt?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "husk"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Logg inn"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 9cc4f00ab4cb7c84647b3337a1f1b08acd428f38..1517bab64f4a67237d2520f527a15f2756f96e33 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -77,15 +77,15 @@ msgstr "Klarte ikke å skrive til disk"
 msgid "Not enough storage available"
 msgstr "Ikke nok lagringsplass"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Ugyldig katalog."
 
@@ -93,36 +93,36 @@ msgstr "Ugyldig katalog."
 msgid "Files"
 msgstr "Filer"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Ikke nok lagringsplass"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Opplasting avbrutt."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL-en kan ikke være tom."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Feil"
 
@@ -134,7 +134,7 @@ msgstr "Del"
 msgid "Delete permanently"
 msgstr "Slett permanent"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Gi nytt navn"
 
@@ -166,13 +166,13 @@ msgstr "erstattet {new_name} med {old_name}"
 msgid "undo"
 msgstr "angre"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mappe"
 msgstr[1] "%n mapper"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fil"
@@ -229,25 +229,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Endret"
 
@@ -256,7 +256,7 @@ msgstr "Endret"
 msgid "%s could not be renamed"
 msgstr "Kunne ikke gi nytt navn til %s"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Last opp"
 
@@ -292,65 +292,65 @@ msgstr "Maksimal størrelse på ZIP-filer"
 msgid "Save"
 msgstr "Lagre"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Ny"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Tekstfil"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Mappe"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Fra link"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Slettet filer"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Avbryt opplasting"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Du har ikke skrivetilgang her."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting her. Last opp noe!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Avslutt deling"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Filen er for stor"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filene du prøver å laste opp er for store for å laste opp til denne serveren."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Skanner filer, vennligst vent."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Pågående skanning"
 
diff --git a/l10n/nb_NO/files_encryption.po b/l10n/nb_NO/files_encryption.po
index 3cc1c898bf6253bde272b3db49adad689a492969..216d616ae7d093350282fcbc080eadb043188b85 100644
--- a/l10n/nb_NO/files_encryption.po
+++ b/l10n/nb_NO/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index 02cbd3e982f2892ff3ce1e5fde75910ce3f7fdac..16310526a9ebfb244b701906aec97287e0915e94 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "Passordet er feil. Prøv på nytt."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Passord"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Send inn"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -54,28 +54,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s delte mappen %s med deg"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s delte filen %s med deg"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Last opp"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Avbryt opplasting"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Forhåndsvisning ikke tilgjengelig for"
diff --git a/l10n/nb_NO/files_trashbin.po b/l10n/nb_NO/files_trashbin.po
index a46fbd42724d51195def7f2a1d8c8744b3c9c792..776489133bcc0a5e3c8f57a5b93a77d6d56a6f57 100644
--- a/l10n/nb_NO/files_trashbin.po
+++ b/l10n/nb_NO/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -28,42 +28,10 @@ msgstr "Kunne ikke slette %s fullstendig"
 msgid "Couldn't restore %s"
 msgstr "Kunne ikke gjenopprette %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "utfør gjenopprettings operasjon"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Feil"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "slett filer permanent"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Slett permanent"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Navn"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Slettet"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] "%n mapper"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] "%n filer"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -72,11 +40,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Ingenting her. Søppelkassen din er tom!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Navn"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Gjenopprett"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Slettet"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Slett"
 
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 6eb013d0b16bf85c1d54f4928374b166cb1ec1a0..b97beddde97959ecdd68bf0cbf66b0134ad12f10 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Hjelp"
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index f3b245682f9df87be6e34d1b281aa7eacf7bd641..954379b3c501f46c45d7fa74d840142d2eafdf43 100644
--- a/l10n/ne/core.po
+++ b/l10n/ne/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -311,27 +272,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -340,7 +280,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr ""
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -372,7 +317,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr ""
 
@@ -444,30 +389,58 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -504,7 +477,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr ""
 
@@ -548,7 +521,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr ""
 
@@ -560,6 +533,34 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -589,14 +590,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr ""
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -686,12 +679,12 @@ msgstr ""
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr ""
 
@@ -709,19 +702,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ne/files_encryption.po b/l10n/ne/files_encryption.po
index 51452a957a505d8c386cd820425ac4fb695bf936..a2f7c432f141076bdd99f5907476e1c8d1acfd82 100644
--- a/l10n/ne/files_encryption.po
+++ b/l10n/ne/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ne/files_sharing.po b/l10n/ne/files_sharing.po
index 8f745e77bbe0250c330cd92d053959172cd6bf2e..a6f34cb330e179c546042ce45a7e1482006d6598 100644
--- a/l10n/ne/files_sharing.po
+++ b/l10n/ne/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-07-31 01:55-0400\n"
-"PO-Revision-Date: 2013-07-31 05:56+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
-msgid "Password"
+msgid "The password is wrong. Try again."
 msgstr ""
 
-#: templates/authenticate.php:9
-msgid "Submit"
+#: templates/authenticate.php:10
+msgid "Password"
 msgstr ""
 
 #: templates/part.404.php:3
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:85
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/ne/files_trashbin.po b/l10n/ne/files_trashbin.po
index 06099b3a416256281e7f18ddf5091d331b9ab54a..d733415ed4d7c583d584605d9157efde8b4b2c51 100644
--- a/l10n/ne/files_trashbin.po
+++ b/l10n/ne/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-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -27,55 +27,31 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:100
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:36
-msgid "delete file permanently"
+#: lib/trashbin.php:814 lib/trashbin.php:816
+msgid "restored"
 msgstr ""
 
-#: js/trash.js:127
-msgid "Delete permanently"
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: js/trash.js:182 templates/index.php:17
+#: templates/index.php:23
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:183 templates/index.php:27
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:191
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:197
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/trash.php:819 lib/trash.php:821
-msgid "restored"
-msgstr ""
-
-#: templates/index.php:9
-msgid "Nothing in here. Your trash bin is empty!"
+#: templates/index.php:26 templates/index.php:28
+msgid "Restore"
 msgstr ""
 
-#: templates/index.php:20 templates/index.php:22
-msgid "Restore"
+#: templates/index.php:34
+msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:30 templates/index.php:31
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr ""
 
diff --git a/l10n/ne/user_ldap.po b/l10n/ne/user_ldap.po
index 823ea6ee1a6a3e28877b896b893f250ddfcaa514..4c9595f78fd01bcc6b6cc123084855ffc45cfc40 100644
--- a/l10n/ne/user_ldap.po
+++ b/l10n/ne/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:36
+#: ajax/testConfiguration.php:37
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:39
+#: ajax/testConfiguration.php:40
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:43
+#: ajax/testConfiguration.php:44
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index fe8aa55429398ca06c9f9e4e69a619e5e59b017f..4371e831d35ecd65ca193a0a635cea9d91b2e14c 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -28,7 +28,7 @@ msgstr "%s deelde »%s« met jou"
 #: ajax/share.php:168
 #, php-format
 msgid "Couldn't send mail to following users: %s "
-msgstr ""
+msgstr "Kon geen e-mail sturen aan de volgende gebruikers: %s"
 
 #: ajax/share.php:327
 msgid "group"
@@ -59,45 +59,6 @@ msgstr "Bestandscache bijgewerkt"
 msgid "... %d%% done ..."
 msgstr "... %d%% gereed ..."
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Categorie type niet opgegeven."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Geen categorie om toe te voegen?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Deze categorie bestaat al: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Object type niet opgegeven."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID niet opgegeven."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Toevoegen van %s aan favorieten is mislukt."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Geen categorie geselecteerd voor verwijdering."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Verwijderen %s van favorieten is mislukt."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Geen afbeelding of bestand opgegeven"
@@ -277,22 +238,22 @@ msgstr "Fout bij laden berichtensjabloon: {error}"
 #: js/oc-dialogs.js:347
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{count} bestandsconflict"
+msgstr[1] "{count} bestandsconflicten"
 
 #: js/oc-dialogs.js:361
 msgid "One file conflict"
-msgstr ""
+msgstr "Een bestandsconflict"
 
 #: js/oc-dialogs.js:367
 msgid "Which files do you want to keep?"
-msgstr ""
+msgstr "Welke bestanden wilt u bewaren?"
 
 #: js/oc-dialogs.js:368
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
-msgstr ""
+msgstr "Als u beide versies selecteerde, zal het gekopieerde bestand een nummer aan de naam toegevoegd krijgen."
 
 #: js/oc-dialogs.js:376
 msgid "Cancel"
@@ -300,40 +261,19 @@ msgstr "Annuleer"
 
 #: js/oc-dialogs.js:386
 msgid "Continue"
-msgstr ""
+msgstr "Verder"
 
 #: js/oc-dialogs.js:433 js/oc-dialogs.js:446
 msgid "(all selected)"
-msgstr ""
+msgstr "(alles geselecteerd)"
 
 #: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "({count} selected)"
-msgstr ""
+msgstr "({count} geselecteerd)"
 
 #: js/oc-dialogs.js:457
 msgid "Error loading file exists template"
-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 "Het object type is niet gespecificeerd."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Fout"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "De app naam is niet gespecificeerd."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Het vereiste bestand {file} is niet geïnstalleerd!"
+msgstr "Fout bij laden bestand bestaat al sjabloon"
 
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
@@ -343,7 +283,12 @@ msgstr "Gedeeld"
 msgid "Share"
 msgstr "Delen"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Fout"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Fout tijdens het delen"
 
@@ -375,7 +320,7 @@ msgstr "Deel met link"
 msgid "Password protect"
 msgstr "Wachtwoord beveiligd"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -421,7 +366,7 @@ msgstr "Stop met delen"
 
 #: js/share.js:353
 msgid "notify user by email"
-msgstr ""
+msgstr "Gebruiker via e-mail notificeren"
 
 #: js/share.js:361
 msgid "can edit"
@@ -447,30 +392,58 @@ msgstr "verwijderen"
 msgid "share"
 msgstr "deel"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Wachtwoord beveiligd"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Fout tijdens het verwijderen van de verval datum"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Fout tijdens het instellen van de vervaldatum"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Versturen ..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "E-mail verzonden"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Waarschuwing"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Het object type is niet gespecificeerd."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Verwijder"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Toevoegen"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -507,7 +480,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Je ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Gebruikersnaam"
 
@@ -551,7 +524,7 @@ msgstr "Persoonlijk"
 msgid "Users"
 msgstr "Gebruikers"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Apps"
 
@@ -563,6 +536,34 @@ msgstr "Beheerder"
 msgid "Help"
 msgstr "Help"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Toegang verboden"
@@ -579,26 +580,18 @@ msgid ""
 "just letting you know that %s shared %s with you.\n"
 "View it: %s\n"
 "\n"
-msgstr ""
+msgstr "Hallo daar,\n\neven een berichtje dat %s %s met u deelde.\nBekijk het: %s\n\n"
 
 #: templates/altmail.php:4
 #, php-format
 msgid ""
 "The share will expire on %s.\n"
 "\n"
-msgstr ""
+msgstr "De Share vervalt op %s.\n\n\n\n"
 
 #: templates/altmail.php:6 templates/mail.php:19
 msgid "Cheers!"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Wijzig categorieën"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Toevoegen"
+msgstr "Proficiat!"
 
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
@@ -687,14 +680,14 @@ msgstr "Installatie afronden"
 
 #: templates/installation.php:184
 msgid "Finishing …"
-msgstr ""
+msgstr "Afronden ..."
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s is beschikbaar. Verkrijg meer informatie over het bijwerken."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Afmelden"
 
@@ -712,19 +705,27 @@ msgstr "Als je je wachtwoord niet onlangs heeft aangepast, kan je account overge
 msgid "Please change your password to secure your account again."
 msgstr "Wijzig je wachtwoord zodat je account weer beveiligd is."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr "Authenticatie bij de server mislukte!"
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr "Neem contact op met uw systeembeheerder."
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Wachtwoord vergeten?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "onthoud gegevens"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Meld je aan"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Alternatieve inlogs"
 
@@ -733,12 +734,12 @@ msgstr "Alternatieve inlogs"
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>"
-msgstr ""
+msgstr "Hallo daar,<br><br>even een berichtje dat %s »%s« met u deelde.<br><a href=\"%s\">Bekijk hier!</a><br><br>"
 
 #: templates/mail.php:17
 #, php-format
 msgid "The share will expire on %s.<br><br>"
-msgstr ""
+msgstr "Het delen stopt op %s.<br><br>"
 
 #: templates/update.php:3
 #, php-format
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index 6e300827bb984b56944cbb5e9f4234a22c71a2e9..9786f5d5da6ed8981180a372630c315d45e7f48f 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-12 08: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"
@@ -76,15 +76,15 @@ msgstr "Schrijven naar schijf mislukt"
 msgid "Not enough storage available"
 msgstr "Niet genoeg opslagruimte beschikbaar"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
-msgstr ""
+msgstr "Upload mislukt, Kon geen bestandsinfo krijgen."
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
-msgstr ""
+msgstr "Upload mislukt. Kon ge-uploade bestand niet vinden"
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Ongeldige directory."
 
@@ -92,36 +92,36 @@ msgstr "Ongeldige directory."
 msgid "Files"
 msgstr "Bestanden"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Kan {filename} niet uploaden omdat het een map is of 0 bytes groot is"
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Niet genoeg ruimte beschikbaar"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Uploaden geannuleerd."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
-msgstr ""
+msgstr "Kon het resultaat van de server niet terugkrijgen."
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL kan niet leeg zijn."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Ongeldige mapnaam. Gebruik van 'Gedeeld' is voorbehouden aan Owncloud zelf"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Fout"
 
@@ -133,7 +133,7 @@ msgstr "Delen"
 msgid "Delete permanently"
 msgstr "Verwijder definitief"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Hernoem"
 
@@ -165,13 +165,13 @@ msgstr "verving {new_name} met {old_name}"
 msgid "undo"
 msgstr "ongedaan maken"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] "%n mappen"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -213,14 +213,14 @@ msgstr "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)"
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
-msgstr ""
+msgstr "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in."
 
 #: js/files.js:72
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
-msgstr ""
+msgstr "Ongeldige privésleutel voor crypto app. Werk het privésleutel wachtwoord bij in uw persoonlijke instellingen om opnieuw toegang te krijgen tot uw versleutelde bestanden."
 
 #: js/files.js:76
 msgid ""
@@ -228,25 +228,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Encryptie is uitgeschakeld maar uw bestanden zijn nog steeds versleuteld. Ga naar uw persoonlijke instellingen om uw bestanden te decoderen."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
-msgstr ""
+msgstr "Fout bij verplaatsen bestand"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Naam"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Grootte"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Aangepast"
 
@@ -255,7 +255,7 @@ msgstr "Aangepast"
 msgid "%s could not be renamed"
 msgstr "%s kon niet worden hernoemd"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Uploaden"
 
@@ -291,65 +291,65 @@ msgstr "Maximale grootte voor ZIP bestanden"
 msgid "Save"
 msgstr "Bewaren"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nieuw"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Tekstbestand"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Map"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Vanaf link"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Verwijderde bestanden"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Upload afbreken"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "U hebt hier geen schrijfpermissies."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Er bevindt zich hier niets. Upload een bestand!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Downloaden"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Stop met delen"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Verwijder"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Upload is te groot"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane  bestandsgrootte voor deze server."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Bestanden worden gescand, even wachten."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Er wordt gescand"
 
diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po
index cf8ef83024d5b8d754238c3b5dc0dd257957d2eb..f78cf6d00391ec62e7214728db2f8491415d93de 100644
--- a/l10n/nl/files_encryption.po
+++ b/l10n/nl/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -55,14 +55,14 @@ msgid ""
 "correct."
 msgstr "Kon het wachtwoord van de privésleutel niet wijzigen. Misschien was het oude wachtwoord onjuist."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
-msgstr ""
+msgstr "Crypto app niet geïnitialiseerd. Misschien werd de crypto app geheractiveerd tijdens de sessie. Log uit en log daarna opnieuw in om de crypto app te initialiseren."
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -70,6 +70,18 @@ msgid ""
 "files."
 msgstr "Uw privésleutel is niet geldig! Misschien was uw wachtwoord van buitenaf gewijzigd. U kunt het wachtwoord van uw privésleutel aanpassen in uw persoonlijke instellingen om toegang tot uw versleutelde bestanden te vergaren."
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "Missende benodigdheden."
@@ -81,7 +93,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Wees er zeker van dat PHP5.3.3 of nieuwer is geïstalleerd en dat de OpenSSL PHP extensie is ingeschakeld en correct geconfigureerd. De versleutel-app is voorlopig uitgeschakeld."
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "De volgende gebruikers hebben geen configuratie voor encryptie:"
 
@@ -91,97 +103,97 @@ msgstr "Opslaan"
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
-msgstr ""
+msgstr "Ga meteen naar uw"
 
 #: templates/invalid_private_key.php:8
 msgid "personal settings"
 msgstr "persoonlijke instellingen"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Versleuteling"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Activeren herstelsleutel (maakt het mogelijk om gebruikersbestanden terug te halen in geval van verlies van het wachtwoord):"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "Wachtwoord herstelsleulel"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
-msgstr ""
+msgstr "Herhaal het herstelsleutel wachtwoord"
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Geactiveerd"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Gedeactiveerd"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "Wijzig wachtwoord herstelsleutel:"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "Oude wachtwoord herstelsleutel"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "Nieuwe wachtwoord herstelsleutel"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
-msgstr ""
+msgstr "Herhaal het nieuwe herstelsleutel wachtwoord"
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Wijzigen wachtwoord"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Het wachtwoord van uw privésleutel komt niet meer overeen met uw inlogwachtwoord:"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "Stel het wachtwoord van uw oude privésleutel in op uw huidige inlogwachtwoord."
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Als u uw oude wachtwoord niet meer weet, kunt u uw beheerder vragen uw bestanden terug te halen."
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Oude wachtwoord"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Huidige wachtwoord"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "Bijwerken wachtwoord Privésleutel"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Activeren wachtwoord herstel:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Het activeren van deze optie maakt het mogelijk om uw versleutelde bestanden te benaderen als uw wachtwoord kwijt is"
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "Bestandsherstel instellingen bijgewerkt"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "Kon bestandsherstel niet bijwerken"
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index 1acf14b32977ee1b5c727e6178c24a9d4cbc19c2..0dbdacc777d6246fb5e8fe571d1d454a753ceeb5 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/files_sharing.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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
-"Last-Translator: Len <lenny@weijl.org>\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 07:30+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"
@@ -20,17 +20,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr "Deze share is met een wachtwoord beveiligd"
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "Wachtwoord ongeldig. Probeer het nogmaals."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Verzenden"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Sorry, deze link lijkt niet meer in gebruik te zijn."
@@ -55,28 +55,28 @@ msgstr "delen is uitgeschakeld"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Voor meer informatie, neem contact op met de persoon die u deze link heeft gestuurd."
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s deelt de map %s met u"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s deelt het bestand %s met u"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Downloaden"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Uploaden"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Upload afbreken"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Geen voorbeeldweergave beschikbaar voor"
diff --git a/l10n/nl/files_trashbin.po b/l10n/nl/files_trashbin.po
index 83e0e68db8f0dfd644ea719f6a736e0d9a7e8846..fd439cf03a1840da744a85bae1f808eab5686029 100644
--- a/l10n/nl/files_trashbin.po
+++ b/l10n/nl/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -28,42 +28,10 @@ msgstr "Kon %s niet permanent verwijderen"
 msgid "Couldn't restore %s"
 msgstr "Kon %s niet herstellen"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "uitvoeren restore operatie"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Fout"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "verwijder bestanden definitief"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Verwijder definitief"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Naam"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Verwijderd"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n map"
-msgstr[1] "%n mappen"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n bestand"
-msgstr[1] "%n bestanden"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "hersteld"
@@ -72,11 +40,19 @@ msgstr "hersteld"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Niets te vinden. Uw prullenbak is leeg!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Naam"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Herstellen"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Verwijderd"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Verwijder"
 
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index e80090a74f6a86b31e154dcad8db8eb3a8c07eca..5dd76e52f340c239c4d562f5b0cf294c4c20a96b 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 07:20+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"
@@ -90,32 +90,32 @@ msgstr "Kon de app niet bijwerken."
 
 #: changepassword/controller.php:20
 msgid "Wrong password"
-msgstr ""
+msgstr "Onjuist wachtwoord"
 
 #: changepassword/controller.php:42
 msgid "No user supplied"
-msgstr ""
+msgstr "Geen gebruiker opgegeven"
 
 #: changepassword/controller.php:74
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
-msgstr ""
+msgstr "Voer een beheerdersherstelwachtwoord in, anders zullen alle gebruikersgegevens verloren gaan"
 
 #: changepassword/controller.php:79
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
-msgstr ""
+msgstr "Onjuist beheerdersherstelwachtwoord. Controleer het wachtwoord en probeer het opnieuw."
 
 #: changepassword/controller.php:87
 msgid ""
 "Back-end doesn't support password change, but the users encryption key was "
 "successfully updated."
-msgstr ""
+msgstr "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleutel van de gebruiker is succesvol bijgewerkt."
 
 #: changepassword/controller.php:92 changepassword/controller.php:103
 msgid "Unable to change password"
-msgstr ""
+msgstr "Kan wachtwoord niet wijzigen"
 
 #: js/apps.js:43
 msgid "Update to {appversion}"
@@ -161,15 +161,15 @@ msgstr "Bijwerken"
 msgid "Updated"
 msgstr "Bijgewerkt"
 
-#: js/personal.js:225
+#: js/personal.js:220
 msgid "Select a profile picture"
 msgstr "Kies een profielafbeelding"
 
-#: js/personal.js:270
+#: js/personal.js:265
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren."
 
-#: js/personal.js:292
+#: js/personal.js:287
 msgid "Saving..."
 msgstr "Opslaan"
 
@@ -185,32 +185,32 @@ msgstr "ongedaan maken"
 msgid "Unable to remove user"
 msgstr "Kon gebruiker niet verwijderen"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: js/users.js:95 templates/users.php:26 templates/users.php:90
 #: templates/users.php:118
 msgid "Groups"
 msgstr "Groepen"
 
-#: js/users.js:97 templates/users.php:92 templates/users.php:130
+#: js/users.js:100 templates/users.php:92 templates/users.php:130
 msgid "Group Admin"
 msgstr "Groep beheerder"
 
-#: js/users.js:120 templates/users.php:170
+#: js/users.js:123 templates/users.php:170
 msgid "Delete"
 msgstr "Verwijder"
 
-#: js/users.js:277
+#: js/users.js:280
 msgid "add group"
 msgstr "toevoegen groep"
 
-#: js/users.js:436
+#: js/users.js:442
 msgid "A valid username must be provided"
 msgstr "Er moet een geldige gebruikersnaam worden opgegeven"
 
-#: js/users.js:437 js/users.js:443 js/users.js:458
+#: js/users.js:443 js/users.js:449 js/users.js:464
 msgid "Error creating user"
 msgstr "Fout bij aanmaken gebruiker"
 
-#: js/users.js:442
+#: js/users.js:448
 msgid "A valid password must be provided"
 msgstr "Er moet een geldig wachtwoord worden opgegeven"
 
@@ -346,11 +346,11 @@ msgstr "Instellen dat gebruikers alleen met leden binnen hun groepen delen"
 
 #: templates/admin.php:170
 msgid "Allow mail notification"
-msgstr ""
+msgstr "Toestaan e-mailnotificaties"
 
 #: templates/admin.php:171
 msgid "Allow user to send mail notification for shared files"
-msgstr ""
+msgstr "Sta gebruikers toe om e-mailnotificaties  te versturen voor gedeelde bestanden"
 
 #: templates/admin.php:178
 msgid "Security"
@@ -388,11 +388,11 @@ msgstr "Meer"
 msgid "Less"
 msgstr "Minder"
 
-#: templates/admin.php:250 templates/personal.php:161
+#: templates/admin.php:250 templates/personal.php:169
 msgid "Version"
 msgstr "Versie"
 
-#: templates/admin.php:254 templates/personal.php:164
+#: templates/admin.php:254 templates/personal.php:172
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -531,34 +531,34 @@ msgstr "Kies als profielafbeelding"
 msgid "Language"
 msgstr "Taal"
 
-#: templates/personal.php:119
+#: templates/personal.php:126
 msgid "Help translate"
 msgstr "Help met vertalen"
 
-#: templates/personal.php:125
+#: templates/personal.php:133
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:127
+#: templates/personal.php:135
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "Gebruik dit adres <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">toegang tot uw bestanden via WebDAV</a>"
 
-#: templates/personal.php:138
+#: templates/personal.php:146
 msgid "Encryption"
 msgstr "Versleuteling"
 
-#: templates/personal.php:140
+#: templates/personal.php:148
 msgid "The encryption app is no longer enabled, decrypt all your file"
 msgstr "De encryptie-appplicatie is niet meer aanwezig, decodeer al uw bestanden"
 
-#: templates/personal.php:146
+#: templates/personal.php:154
 msgid "Log-in password"
 msgstr "Inlog-wachtwoord"
 
-#: templates/personal.php:151
+#: templates/personal.php:159
 msgid "Decrypt all Files"
 msgstr "Decodeer alle bestanden"
 
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index 6c69b504f88a03ebb9e03032981863ada59313a7..bd9058b32df68e92292ac31631d728d4d97c5a6a 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: kwillems <kwillems@zonnet.nl>\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 07:10+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"
@@ -371,14 +371,18 @@ msgid ""
 msgstr "Standaard herkent ownCloud het UUID-attribuut automatisch. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij deze hierboven anders is aangegeven. U kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. U moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw gekoppelde (toegevoegde) LDAP-gebruikers en-groepen."
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "UUID Attribuut:"
+msgid "UUID Attribute for Users:"
+msgstr "UUID attribuut voor gebruikers:"
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr "UUID attribuut voor groepen:"
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "Gebruikersnaam-LDAP gebruikers vertaling"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -392,18 +396,18 @@ msgid ""
 "experimental stage."
 msgstr "ownCloud maakt gebruik van gebruikersnamen om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, krijgt elke LDAP-gebruiker ook een interne gebruikersnaam. Dit vereist een koppeling van de ownCloud gebruikersnaam aan een ​​LDAP-gebruiker. De gecreëerde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Aanvullend wordt ook de 'DN' gecached om het aantal LDAP-interacties te verminderen, maar dit wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden. De interne naam wordt overal gebruikt. Het wissen van de koppeling zal overal resten achterlaten. Het wissen van koppelingen is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze koppelingen nooit in een productieomgeving gewist worden. Maak ze alleen leeg in een test- of ontwikkelomgeving."
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Leegmaken Groepsnaam-LDAP groep vertaling"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Test configuratie"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Help"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 085e1a385b896a8174b7b01769773d442c72990d..9bc0e05d7bc31c17e78a86a58e02b5dbdad2117a 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -59,45 +59,6 @@ msgstr "Mellomlager oppdatert"
 msgid "... %d%% done ..."
 msgstr "… %d %% ferdig …"
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Ingen kategoritype."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Ingen kategori å leggja til?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Denne kategorien finst alt: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Ingen objekttype."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "Ingen %s-ID."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Klarte ikkje leggja til %s i favorittar."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Ingen kategoriar valt for sletting."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Klarte ikkje fjerna %s frå favorittar."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Inga bilete eller fil gitt"
@@ -314,27 +275,6 @@ msgstr "({count} valte)"
 msgid "Error loading file exists template"
 msgstr "Klarte ikkje å lasta fil-finst-mal"
 
-#: 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 "Objekttypen er ikkje spesifisert."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Feil"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Programnamnet er ikkje spesifisert."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Den kravde fila {file} er ikkje installert!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Delt"
@@ -343,7 +283,12 @@ msgstr "Delt"
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Feil"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Feil ved deling"
 
@@ -375,7 +320,7 @@ msgstr "Del med lenkje"
 msgid "Password protect"
 msgstr "Passordvern"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Passord"
 
@@ -447,30 +392,58 @@ msgstr "slett"
 msgid "share"
 msgstr "del"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Passordverna"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Klarte ikkje fjerna utløpsdato"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Klarte ikkje setja utløpsdato"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Sender …"
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "E-post sendt"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Åtvaring"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Objekttypen er ikkje spesifisert."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Slett"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Legg til"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -507,7 +480,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Du vil få ein e-post med ei lenkje for å nullstilla passordet."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Brukarnamn"
 
@@ -551,7 +524,7 @@ msgstr "Personleg"
 msgid "Users"
 msgstr "Brukarar"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Program"
 
@@ -563,6 +536,34 @@ msgstr "Admin"
 msgid "Help"
 msgstr "Hjelp"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Tilgang forbudt"
@@ -592,14 +593,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Endra kategoriar"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Legg til"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -689,12 +682,12 @@ msgstr "Fullfør oppsettet"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s er tilgjengeleg. Få meir informasjon om korleis du oppdaterer."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Logg ut"
 
@@ -712,19 +705,27 @@ msgstr "Viss du ikkje endra passordet ditt nyleg, så kan kontoen din vera kompr
 msgid "Please change your password to secure your account again."
 msgstr "Ver venleg og endra passordet for å gjera kontoen din trygg igjen."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Gløymt passordet?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "hugs"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Logg inn"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Alternative innloggingar"
 
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 4204e676cf30897caf4a1c3fbd9d958f534d3309..e1b3babfc3eac6d4e0c72e74f785dc8cc8b2e03e 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -77,15 +77,15 @@ msgstr "Klarte ikkje skriva til disk"
 msgid "Not enough storage available"
 msgstr "Ikkje nok lagringsplass tilgjengeleg"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr "Feil ved opplasting. Klarte ikkje å henta filinfo."
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Feil ved opplasting. Klarte ikkje å finna opplasta fil."
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Ugyldig mappe."
 
@@ -93,36 +93,36 @@ msgstr "Ugyldig mappe."
 msgid "Files"
 msgstr "Filer"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Klarte ikkje å lasta opp {filename} sidan det er ei mappe eller er 0 byte."
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Ikkje nok lagringsplass tilgjengeleg"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Opplasting avbroten."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr "Klarte ikkje å henta resultat frå tenaren."
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "Nettadressa kan ikkje vera tom."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Feil"
 
@@ -134,7 +134,7 @@ msgstr "Del"
 msgid "Delete permanently"
 msgstr "Slett for godt"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Endra namn"
 
@@ -166,13 +166,13 @@ msgstr "bytte ut {new_name} med {old_name}"
 msgid "undo"
 msgstr "angre"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mappe"
 msgstr[1] "%n mapper"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fil"
@@ -229,25 +229,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Kryptering er skrudd av, men filene dine er enno krypterte. Du kan dekryptera filene i personlege innstillingar."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "Feil ved flytting av fil"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Storleik"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Endra"
 
@@ -256,7 +256,7 @@ msgstr "Endra"
 msgid "%s could not be renamed"
 msgstr "Klarte ikkje å omdøypa på %s"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Last opp"
 
@@ -292,65 +292,65 @@ msgstr "Maksimal storleik for ZIP-filer"
 msgid "Save"
 msgstr "Lagre"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Ny"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Tekst fil"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Mappe"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Frå lenkje"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Sletta filer"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Avbryt opplasting"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Du har ikkje skriverettar her."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting her. Last noko opp!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Udel"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "For stor opplasting"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Skannar filer, ver venleg og vent."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Køyrande skanning"
 
diff --git a/l10n/nn_NO/files_encryption.po b/l10n/nn_NO/files_encryption.po
index 70e3dcdd71a7b5f778c1be779bbf35d00870401c..238694b0a6bd5593d9ddcab111e4e6a9f23b1bc1 100644
--- a/l10n/nn_NO/files_encryption.po
+++ b/l10n/nn_NO/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 4b5c1c4d3ae512c9a1542fd9f732e2b8adadc072..830be08d659eda48d641cf070a73911cb3b83cba 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
-"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "Passordet er gale. Prøv igjen."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Passord"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Send"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Orsak, denne lenkja fungerer visst ikkje lenger."
@@ -54,28 +54,28 @@ msgstr "deling er slått av"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Spør den som sende deg lenkje om du vil ha meir informasjon."
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s delte mappa %s med deg"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s delte fila %s med deg"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Last opp"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Avbryt opplasting"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Inga førehandsvising tilgjengeleg for"
diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po
index 66efc5fddc1da7ad4acf06edf1701adc36932170..a88e34c958f7cd47596d1169a0320984998586f6 100644
--- a/l10n/nn_NO/files_trashbin.po
+++ b/l10n/nn_NO/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,42 +29,10 @@ msgstr "Klarte ikkje sletta %s for godt"
 msgid "Couldn't restore %s"
 msgstr "Klarte ikkje gjenoppretta %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "utfør gjenoppretting"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Feil"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "slett fila for godt"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Slett for godt"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Namn"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Sletta"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n mappe"
-msgstr[1] "%n mapper"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n fil"
-msgstr[1] "%n filer"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "gjenoppretta"
@@ -73,11 +41,19 @@ msgstr "gjenoppretta"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Ingenting her. Papirkorga di er tom!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Namn"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Gjenopprett"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Sletta"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Slett"
 
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 66ed7b6861a8b4aaabc1d374ddf607952ea3f46a..3f81d3a16af9196e19917c4b1b976051506ed7cb 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Hjelp"
diff --git a/l10n/nqo/core.po b/l10n/nqo/core.po
index 1f88b512be51d7715ef00b4d01ad828f1b84a78a..a5c18d50ee19c70a3deffd709ffb7baff2697015 100644
--- a/l10n/nqo/core.po
+++ b/l10n/nqo/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
 "MIME-Version: 1.0\n"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -306,27 +267,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -335,7 +275,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr ""
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -367,7 +312,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr ""
 
@@ -439,30 +384,58 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -499,7 +472,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr ""
 
@@ -543,7 +516,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr ""
 
@@ -555,6 +528,34 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -584,14 +585,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr ""
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -681,12 +674,12 @@ msgstr ""
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr ""
 
@@ -704,19 +697,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/nqo/files_encryption.po b/l10n/nqo/files_encryption.po
index f920009def841949255562373a1d766dbc64a8c0..e5030079629771976689e071c8e1f2efde6acba1 100644
--- a/l10n/nqo/files_encryption.po
+++ b/l10n/nqo/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
 "MIME-Version: 1.0\n"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/nqo/files_sharing.po b/l10n/nqo/files_sharing.po
index 8c548248cff1854e126126c5949f1ba6b35eb95e..b85ec335e2e11f0683a2a72f35829cc2209ba97d 100644
--- a/l10n/nqo/files_sharing.po
+++ b/l10n/nqo/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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-07 07:28+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
-msgid "Password"
+msgid "The password is wrong. Try again."
 msgstr ""
 
-#: templates/authenticate.php:9
-msgid "Submit"
+#: templates/authenticate.php:10
+msgid "Password"
 msgstr ""
 
 #: templates/part.404.php:3
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/nqo/files_trashbin.po b/l10n/nqo/files_trashbin.po
index 8c737c0b7573e81407e187aab8e6a7a82aca9d96..69ea00584d04a6a5cfbcbdcf9cd6033ce0d824a5 100644
--- a/l10n/nqo/files_trashbin.po
+++ b/l10n/nqo/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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-07 07:28+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
 "MIME-Version: 1.0\n"
@@ -27,53 +27,31 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:37
-msgid "delete file permanently"
+#: lib/trashbin.php:814 lib/trashbin.php:816
+msgid "restored"
 msgstr ""
 
-#: js/trash.js:129
-msgid "Delete permanently"
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: js/trash.js:184 templates/index.php:17
+#: templates/index.php:23
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:185 templates/index.php:27
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:193
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/trash.js:199
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
-#: lib/trash.php:814 lib/trash.php:816
-msgid "restored"
-msgstr ""
-
-#: templates/index.php:9
-msgid "Nothing in here. Your trash bin is empty!"
+#: templates/index.php:26 templates/index.php:28
+msgid "Restore"
 msgstr ""
 
-#: templates/index.php:20 templates/index.php:22
-msgid "Restore"
+#: templates/index.php:34
+msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:30 templates/index.php:31
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr ""
 
diff --git a/l10n/nqo/user_ldap.po b/l10n/nqo/user_ldap.po
index d377705d79dba1e7a448a345c616cf0bd476538a..e95cc82f5d41a3cb4d05e6646b83bc7886f686cd 100644
--- a/l10n/nqo/user_ldap.po
+++ b/l10n/nqo/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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-07 07:28+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
 "MIME-Version: 1.0\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:36
+#: ajax/testConfiguration.php:37
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:39
+#: ajax/testConfiguration.php:40
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:43
+#: ajax/testConfiguration.php:44
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr ""
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index fb6cba7ca6a3d6cef598dc8155aece96304e74a5..cfb01291bbc01c962a7ede8175e43df4ce0c9247 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 "Pas de categoria d'ajustar ?"
-
-#: 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 "Pas de categorias seleccionadas per escafar."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -311,27 +272,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Error"
-
-#: 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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -340,7 +280,12 @@ msgstr ""
 msgid "Share"
 msgstr "Parteja"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Error"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Error al partejar"
 
@@ -372,7 +317,7 @@ msgstr "Parteja amb lo ligam"
 msgid "Password protect"
 msgstr "Parat per senhal"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Senhal"
 
@@ -444,30 +389,58 @@ msgstr "escafa"
 msgid "share"
 msgstr "parteja"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Parat per senhal"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Error al metre de la data d'expiracion"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Error setting expiration date"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Escafa"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Ajusta"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -504,7 +477,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Reçaupràs un ligam per tornar botar ton senhal via corrièl."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Non d'usancièr"
 
@@ -548,7 +521,7 @@ msgstr "Personal"
 msgid "Users"
 msgstr "Usancièrs"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Apps"
 
@@ -560,6 +533,34 @@ msgstr "Admin"
 msgid "Help"
 msgstr "Ajuda"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Acces enebit"
@@ -589,14 +590,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Edita categorias"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Ajusta"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -686,12 +679,12 @@ msgstr "Configuracion acabada"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Sortida"
 
@@ -709,19 +702,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "L'as perdut lo senhal ?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "bremba-te"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Dintrada"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index 4aade026f62e9c13ce326e131f89ebbcd3bf0c42..b0cbe580c3f08293f1e4627f259d2b013aed00fb 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -74,15 +74,15 @@ msgstr "L'escriptura sul disc a fracassat"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr ""
 
@@ -90,36 +90,36 @@ msgstr ""
 msgid "Files"
 msgstr "Fichièrs"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr ""
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Amontcargar anullat."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. "
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Error"
 
@@ -131,7 +131,7 @@ msgstr "Parteja"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Torna nomenar"
 
@@ -163,13 +163,13 @@ msgstr ""
 msgid "undo"
 msgstr "defar"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -226,25 +226,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Talha"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Modificat"
 
@@ -253,7 +253,7 @@ msgstr "Modificat"
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Amontcarga"
 
@@ -289,65 +289,65 @@ msgstr "Talha maximum de dintrada per fichièrs ZIP"
 msgid "Save"
 msgstr "Enregistra"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nòu"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Fichièr de tèxte"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Dorsièr"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr " Anulla l'amontcargar"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Pas res dedins. Amontcarga qualquaren"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Avalcarga"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Pas partejador"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Escafa"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Amontcargament tròp gròs"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Los fiichièrs son a èsser explorats, "
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Exploracion en cors"
 
diff --git a/l10n/oc/files_encryption.po b/l10n/oc/files_encryption.po
index bd86a56e3be29f363ef0c0dc2f8927fd699dacb0..ccc3a21087a12037d48165b2ed755d3bc74e6cd0 100644
--- a/l10n/oc/files_encryption.po
+++ b/l10n/oc/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po
index a94307e4bfd08313201b25d3ec9f1262d48b571f..50f000cd08e99b5eeee3e16a3a847bc9a31dc3bc 100644
--- a/l10n/oc/files_sharing.po
+++ b/l10n/oc/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Senhal"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Sosmetre"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Avalcarga"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Amontcarga"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr " Anulla l'amontcargar"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/oc/files_trashbin.po b/l10n/oc/files_trashbin.po
index 6ac8f8fe28847ad3ddd8e2564cda64ae99082be8..9978295c0fc300846ba46c1dace8f24738362fc8 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -27,42 +27,10 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Error"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr ""
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Nom"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -71,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Nom"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Escafa"
 
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index d5c42bcf74d5c18dcf84ecb55468adf8360d1291..6a0fe02297d62f5dabce00d2174d06db52320595 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/pa/core.po b/l10n/pa/core.po
index 0550db2c49d1201772753cb9d0fc60522068f583..fd1ae456d644b867153c88dbfb48258265722f5d 100644
--- a/l10n/pa/core.po
+++ b/l10n/pa/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:31+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
 "MIME-Version: 1.0\n"
@@ -57,45 +57,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -312,27 +273,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -341,7 +281,12 @@ msgstr ""
 msgid "Share"
 msgstr "ਸਾਂਝਾ ਕਰੋ"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "ਗਲ"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -373,7 +318,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "ਪਾਸਵਰ"
 
@@ -445,30 +390,58 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "ਚੇਤਾਵਨੀ"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "ਹਟਾਓ"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -505,7 +478,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "ਯੂਜ਼ਰ-ਨਾਂ"
 
@@ -549,7 +522,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr ""
 
@@ -561,6 +534,34 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -590,14 +591,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr ""
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -687,12 +680,12 @@ msgstr ""
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr ""
 
@@ -710,19 +703,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/pa/files_encryption.po b/l10n/pa/files_encryption.po
index 05e365c81e1731a521614e57d325575de280b38c..4750385bd16bc367cf8d997c6f164a2f5ab2793f 100644
--- a/l10n/pa/files_encryption.po
+++ b/l10n/pa/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
 "MIME-Version: 1.0\n"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/pa/files_sharing.po b/l10n/pa/files_sharing.po
index 5857f609be9fbad2aab683ec89f93c85b7a54709..1a46db8eb35745181e6149770338535918790115 100644
--- a/l10n/pa/files_sharing.po
+++ b/l10n/pa/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-09-18 11:47-0400\n"
-"PO-Revision-Date: 2013-09-17 13:20+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
 "MIME-Version: 1.0\n"
@@ -18,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "ਪਾਸਵਰ"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr ""
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "ਡਾਊਨਲੋਡ"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "ਅੱਪਲੋਡ"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/pa/files_trashbin.po b/l10n/pa/files_trashbin.po
index 2d8b4c38b76182da88da72576db91785337173ae..b5dca330f6e94ec6560dc00b208f75aafbe5f976 100644
--- a/l10n/pa/files_trashbin.po
+++ b/l10n/pa/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
 "MIME-Version: 1.0\n"
@@ -27,42 +27,10 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr ""
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr ""
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -71,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "ਹਟਾਓ"
 
diff --git a/l10n/pa/user_ldap.po b/l10n/pa/user_ldap.po
index ca4f0b3e2ce436d428aa106361be78f913bc9413..28501d8f8e68baffe93b6f64d76cda465aee954b 100644
--- a/l10n/pa/user_ldap.po
+++ b/l10n/pa/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
 "MIME-Version: 1.0\n"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr ""
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 19427c791cc1a8c95b3131c0c273b242084ee59d..a4a01c71ac0043080d9d20154de8646f810c36ae 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -58,48 +58,9 @@ msgstr "Zaktualizuj filecache"
 msgid "... %d%% done ..."
 msgstr "... %d%% udane ..."
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Nie podano typu kategorii."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Brak kategorii do dodania?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Ta kategoria już istnieje: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Nie podano typu obiektu."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "Nie podano ID %s."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Błąd podczas dodawania %s do ulubionych."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Nie zaznaczono kategorii do usunięcia."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Błąd podczas usuwania %s z ulubionych."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
-msgstr ""
+msgstr "Brak obrazu lub pliku dostarczonego"
 
 #: avatar/controller.php:81
 msgid "Unknown filetype"
@@ -318,27 +279,6 @@ msgstr "({count} zaznaczonych)"
 msgid "Error loading file exists template"
 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 "Nie określono typu obiektu."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Błąd"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Nie określono nazwy aplikacji."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Wymagany plik {file} nie jest zainstalowany!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Udostępniono"
@@ -347,7 +287,12 @@ msgstr "Udostępniono"
 msgid "Share"
 msgstr "Udostępnij"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Błąd"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Błąd podczas współdzielenia"
 
@@ -379,7 +324,7 @@ msgstr "Współdziel wraz z odnośnikiem"
 msgid "Password protect"
 msgstr "Zabezpiecz hasłem"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Hasło"
 
@@ -425,7 +370,7 @@ msgstr "Zatrzymaj współdzielenie"
 
 #: js/share.js:353
 msgid "notify user by email"
-msgstr ""
+msgstr "powiadom użytkownika przez email"
 
 #: js/share.js:361
 msgid "can edit"
@@ -451,30 +396,58 @@ msgstr "usuń"
 msgid "share"
 msgstr "współdziel"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Zabezpieczone hasłem"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Błąd podczas usuwania daty wygaśnięcia"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Błąd podczas ustawiania daty wygaśnięcia"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Wysyłanie..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "E-mail wysłany"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Nie określono typu obiektu."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Usuń"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Dodaj"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -511,7 +484,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
@@ -555,7 +528,7 @@ msgstr "Osobiste"
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Aplikacje"
 
@@ -567,6 +540,34 @@ msgstr "Administrator"
 msgid "Help"
 msgstr "Pomoc"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Dostęp zabroniony"
@@ -590,19 +591,11 @@ msgstr ""
 msgid ""
 "The share will expire on %s.\n"
 "\n"
-msgstr ""
+msgstr "Udostępnienie wygaśnie w dniu %s.\n\n"
 
 #: templates/altmail.php:6 templates/mail.php:19
 msgid "Cheers!"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Edytuj kategorie"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Dodaj"
+msgstr "Pozdrawiam!"
 
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
@@ -691,14 +684,14 @@ msgstr "Zakończ konfigurowanie"
 
 #: templates/installation.php:184
 msgid "Finishing …"
-msgstr ""
+msgstr "Kończę ..."
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s jest dostępna. Dowiedz się więcej na temat aktualizacji."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Wyloguj"
 
@@ -716,19 +709,27 @@ msgstr "Jeśli hasło było dawno niezmieniane, twoje konto może być zagrożon
 msgid "Please change your password to secure your account again."
 msgstr "Zmień swoje hasło, aby ponownie zabezpieczyć swoje konto."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr "Uwierzytelnianie po stronie serwera nie powiodło się!"
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr "Skontaktuj się z administratorem"
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Nie pamiętasz hasła?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "pamiętaj"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Zaloguj"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Alternatywne loginy"
 
@@ -737,12 +738,12 @@ msgstr "Alternatywne loginy"
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>"
-msgstr ""
+msgstr "Cześć,<br><br>Informuję cię że %s udostępnia ci »%s«.\n<br><a href=\"%s\">Zobacz!</a><br><br>"
 
 #: templates/mail.php:17
 #, php-format
 msgid "The share will expire on %s.<br><br>"
-msgstr ""
+msgstr "Udostępnienie wygaśnie w dniu %s.<br><br>"
 
 #: templates/update.php:3
 #, php-format
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 7249cd990073f6cf7104599505603fcb15186ae9..e159b8c7883545231ff67211916aa1791c5815d3 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -77,15 +77,15 @@ msgstr "Błąd zapisu na dysk"
 msgid "Not enough storage available"
 msgstr "Za mało dostępnego miejsca"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr "Nieudane przesłanie. Nie można pobrać informacji o pliku."
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Nieudane przesłanie. Nie można znaleźć przesyłanego pliku"
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Zła ścieżka."
 
@@ -93,36 +93,36 @@ msgstr "Zła ścieżka."
 msgid "Files"
 msgstr "Pliki"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Nie można przesłać {filename} być może jest katalogiem lub posiada 0 bajtów"
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Za mało miejsca"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Wczytywanie anulowane."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr "Nie można uzyskać wyniku z serwera."
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL nie może być pusty."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Nieprawidłowa nazwa folderu. Wykorzystanie 'Shared' jest zarezerwowane przez ownCloud"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Błąd"
 
@@ -134,7 +134,7 @@ msgstr "Udostępnij"
 msgid "Delete permanently"
 msgstr "Trwale usuń"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Zmień nazwę"
 
@@ -166,14 +166,14 @@ msgstr "zastąpiono {new_name} przez {old_name}"
 msgid "undo"
 msgstr "cofnij"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n katalog"
 msgstr[1] "%n katalogi"
 msgstr[2] "%n katalogów"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n plik"
@@ -232,25 +232,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Szyfrowanie zostało wyłączone, ale nadal pliki są zaszyfrowane. Przejdź do ustawień osobistych i tam odszyfruj pliki."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "Błąd prz przenoszeniu pliku"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Nazwa"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Rozmiar"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Modyfikacja"
 
@@ -259,7 +259,7 @@ msgstr "Modyfikacja"
 msgid "%s could not be renamed"
 msgstr "%s nie można zmienić nazwy"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Wyślij"
 
@@ -295,65 +295,65 @@ msgstr "Maksymalna wielkość pliku wejściowego ZIP "
 msgid "Save"
 msgstr "Zapisz"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nowy"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Plik tekstowy"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Folder"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Z odnośnika"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Pliki usunięte"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Anuluj wysyłanie"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Nie masz uprawnień do zapisu w tym miejscu."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Pusto. Wyślij coś!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Pobierz"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Zatrzymaj współdzielenie"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Usuń"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Ładowany plik jest za duży"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Skanowanie plików, proszę czekać."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Aktualnie skanowane"
 
diff --git a/l10n/pl/files_encryption.po b/l10n/pl/files_encryption.po
index ccb7d03ca29a3d88baa8bc163b5df62509f0b2bf..e21f822dd943eae635bff201358085cac54d2636 100644
--- a/l10n/pl/files_encryption.po
+++ b/l10n/pl/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -54,14 +54,14 @@ msgid ""
 "correct."
 msgstr "Nie można zmienić prywatnego hasła. Może stare hasło nie było poprawne."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
-msgstr ""
+msgstr "Szyfrowanie aplikacja nie została zainicjowane! Może szyfrowanie aplikacji zostało ponownie włączone podczas tej sesji. Spróbuj się wylogować i zalogować ponownie aby zainicjować szyfrowanie aplikacji."
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -69,6 +69,18 @@ msgid ""
 "files."
 msgstr "Klucz prywatny nie jest ważny! Prawdopodobnie Twoje hasło zostało zmienione poza systemem ownCloud (np. w katalogu firmy). Aby odzyskać dostęp do zaszyfrowanych plików można zaktualizować hasło klucza prywatnego w ustawieniach osobistych."
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "Brak wymagań."
@@ -80,7 +92,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Proszę upewnić się, że PHP 5.3.3 lub nowszy jest zainstalowany i że OpenSSL oraz rozszerzenie PHP jest włączone i poprawnie skonfigurowane. Obecnie szyfrowanie aplikacji zostało wyłączone."
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:"
 
@@ -90,97 +102,97 @@ msgstr "Zapisywanie..."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
-msgstr ""
+msgstr "Przejdź bezpośrednio do"
 
 #: templates/invalid_private_key.php:8
 msgid "personal settings"
 msgstr "Ustawienia osobiste"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Szyfrowanie"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Włączhasło klucza odzyskiwania (pozwala odzyskać pliki użytkowników w przypadku utraty hasła):"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "Hasło klucza odzyskiwania"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
-msgstr ""
+msgstr "Powtórz hasło klucza odzyskiwania"
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Włączone"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "Zmień hasło klucza odzyskiwania"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "Stare hasło klucza odzyskiwania"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "Nowe hasło klucza odzyskiwania"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
-msgstr ""
+msgstr "Powtórz nowe hasło klucza odzyskiwania"
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Zmień hasło"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Hasło klucza prywatnego nie pasuje do  hasła logowania:"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "Podaj swoje stare prywatne hasło aby ustawić nowe"
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Jeśli nie pamiętasz swojego starego hasła, poproś swojego administratora, aby odzyskać pliki."
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Stare hasło logowania"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Bieżące hasło logowania"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "Aktualizacja hasła klucza prywatnego"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Włącz hasło odzyskiwania:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Włączenie tej opcji umożliwia otrzymać dostęp do zaszyfrowanych plików w przypadku utraty hasła"
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "Ustawienia odzyskiwania plików zmienione"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "Nie można zmienić pliku odzyskiwania"
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index 0598448aa83d75c9582771ad59a1ddb153fdd1db..c07378649d173d13de3dd66b0326e22313103f9e 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/files_sharing.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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "To hasło jest niewłaściwe. Spróbuj ponownie."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Hasło"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Wyślij"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Przepraszamy ale wygląda na to, że ten link już nie działa."
@@ -54,28 +54,28 @@ msgstr "Udostępnianie jest wyłączone"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Aby uzyskać więcej informacji proszę poprosić osobę, która wysłał ten link."
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s współdzieli folder z tobą %s"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s współdzieli z tobą plik %s"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Pobierz"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Wyślij"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Anuluj wysyłanie"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Podgląd nie jest dostępny dla"
diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po
index 7a774c7b781f94f8cbe87b2453fd734dd4600533..254f37cba0af89fcc2d264c84f400e02e6816eef 100644
--- a/l10n/pl/files_trashbin.po
+++ b/l10n/pl/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -28,44 +28,10 @@ msgstr "Nie można trwale usunąć %s"
 msgid "Couldn't restore %s"
 msgstr "Nie można przywrócić %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "wykonywanie operacji przywracania"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Błąd"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "trwale usuń plik"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Trwale usuń"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Nazwa"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Usunięte"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] "%n katalogów"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] "%n plików"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "przywrócony"
@@ -74,11 +40,19 @@ msgstr "przywrócony"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Nic tu nie ma. Twój kosz jest pusty!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Nazwa"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Przywróć"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Usunięte"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Usuń"
 
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 057209ec7d48fa048302bcae55ad95e9e07da8bc..6a3be9b0375e1160c46f8b097ac94ba2953c979d 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-10 11:50+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -183,32 +183,32 @@ msgstr "cofnij"
 msgid "Unable to remove user"
 msgstr "Nie można usunąć użytkownika"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: js/users.js:95 templates/users.php:26 templates/users.php:90
 #: templates/users.php:118
 msgid "Groups"
 msgstr "Grupy"
 
-#: js/users.js:97 templates/users.php:92 templates/users.php:130
+#: js/users.js:100 templates/users.php:92 templates/users.php:130
 msgid "Group Admin"
 msgstr "Administrator grupy"
 
-#: js/users.js:120 templates/users.php:170
+#: js/users.js:123 templates/users.php:170
 msgid "Delete"
 msgstr "Usuń"
 
-#: js/users.js:277
+#: js/users.js:280
 msgid "add group"
 msgstr "dodaj grupę"
 
-#: js/users.js:436
+#: js/users.js:442
 msgid "A valid username must be provided"
 msgstr "Należy podać prawidłową nazwę użytkownika"
 
-#: js/users.js:437 js/users.js:443 js/users.js:458
+#: js/users.js:443 js/users.js:449 js/users.js:464
 msgid "Error creating user"
 msgstr "Błąd podczas tworzenia użytkownika"
 
-#: js/users.js:442
+#: js/users.js:448
 msgid "A valid password must be provided"
 msgstr "Należy podać prawidłowe hasło"
 
@@ -344,11 +344,11 @@ msgstr "Zezwalaj użytkownikom współdzielić z użytkownikami ze swoich grup"
 
 #: templates/admin.php:170
 msgid "Allow mail notification"
-msgstr ""
+msgstr "Pozwól na mailowe powiadomienia"
 
 #: templates/admin.php:171
 msgid "Allow user to send mail notification for shared files"
-msgstr ""
+msgstr "Pozwól użytkownikom wysyłać maile powiadamiające o udostępnionych plikach"
 
 #: templates/admin.php:178
 msgid "Security"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index bc98ad8c4e68b170bfd52bc0b65801c6ea07f924..9f1f1fcb7453929582b8b0ad52a765d288ed2fa0 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -370,14 +370,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "Atrybuty UUID:"
+msgid "UUID Attribute for Users:"
+msgstr ""
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "Mapowanie użytkownika LDAP"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -391,18 +395,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Czyść Mapowanie użytkownika LDAP"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Czyść Mapowanie nazwy grupy LDAP"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Konfiguracja testowa"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Pomoc"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 25cee56e61b347b49393a1b0e423747d36dc6988..e761e418f619780caa9fdab94f29b67f05da211c 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 18:00+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -58,45 +58,6 @@ msgstr "Atualizar cache de arquivo"
 msgid "... %d%% done ..."
 msgstr "... %d%% concluído ..."
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Tipo de categoria não fornecido."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Nenhuma categoria a adicionar?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Esta categoria já existe: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "tipo de objeto não fornecido."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID não fornecido(s)."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Erro ao adicionar %s aos favoritos."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Nenhuma categoria selecionada para remoção."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Erro ao remover %s dos favoritos."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Nenhuma imagem ou arquivo fornecido"
@@ -313,27 +274,6 @@ msgstr "({count} selecionados)"
 msgid "Error loading file exists template"
 msgstr "Erro ao carregar arquivo existe modelo"
 
-#: 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 "O tipo de objeto não foi especificado."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Erro"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "O nome do app não foi especificado."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "O arquivo {file} necessário não está instalado!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Compartilhados"
@@ -342,7 +282,12 @@ msgstr "Compartilhados"
 msgid "Share"
 msgstr "Compartilhar"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Erro"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Erro ao compartilhar"
 
@@ -374,7 +319,7 @@ msgstr "Compartilhar com link"
 msgid "Password protect"
 msgstr "Proteger com senha"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Senha"
 
@@ -446,30 +391,58 @@ msgstr "remover"
 msgid "share"
 msgstr "compartilhar"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Protegido com senha"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Erro ao remover data de expiração"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Erro ao definir data de expiração"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Enviando ..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "E-mail enviado"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Aviso"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "O tipo de objeto não foi especificado."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Eliminar"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Adicionar"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -506,7 +479,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Você receberá um link para redefinir sua senha por e-mail."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Nome de usuário"
 
@@ -550,7 +523,7 @@ msgstr "Pessoal"
 msgid "Users"
 msgstr "Usuários"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Aplicações"
 
@@ -562,6 +535,34 @@ msgstr "Admin"
 msgid "Help"
 msgstr "Ajuda"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Acesso proibido"
@@ -591,14 +592,6 @@ msgstr "O compartilhamento irá expirer em %s.\n\n"
 msgid "Cheers!"
 msgstr "Saúde!"
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Editar categorias"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Adicionar"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -688,12 +681,12 @@ msgstr "Concluir configuração"
 msgid "Finishing …"
 msgstr "Finalizando ..."
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s está disponível. Obtenha mais informações sobre como atualizar."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Sair"
 
@@ -711,19 +704,27 @@ msgstr "Se você não mudou a sua senha recentemente, a sua conta pode estar com
 msgid "Please change your password to secure your account again."
 msgstr "Por favor troque sua senha para tornar sua conta segura novamente."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr "Autenticação do servidor falhou!"
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr "Por favor, contate o administrador."
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Esqueceu sua senha?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "lembrar"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Fazer login"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Logins alternativos"
 
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index b888c01d4ba9920cf03347dc79b2eea433d49eab..e65aace59c795ba68e4308461ca26fbf51030fa7 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 17:40+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -77,15 +77,15 @@ msgstr "Falha ao escrever no disco"
 msgid "Not enough storage available"
 msgstr "Espaço de armazenamento insuficiente"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr "Falha no envio. Não foi possível obter informações do arquivo."
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Falha no envio. Não foi possível encontrar o arquivo enviado"
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Diretório inválido."
 
@@ -93,36 +93,36 @@ msgstr "Diretório inválido."
 msgid "Files"
 msgstr "Arquivos"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Incapaz de fazer o envio de {filename}, pois é um diretório ou tem 0 bytes"
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Espaço de armazenamento insuficiente"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr "Não foi possível obter o resultado do servidor."
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Upload em andamento. Sair da página agora resultará no cancelamento do envio."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL não pode ficar em branco"
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Nome de pasta inválido. O uso do nome 'Compartilhado' é reservado ao ownCloud"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Erro"
 
@@ -134,7 +134,7 @@ msgstr "Compartilhar"
 msgid "Delete permanently"
 msgstr "Excluir permanentemente"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Renomear"
 
@@ -166,13 +166,13 @@ msgstr "Substituído {old_name} por {new_name} "
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n pasta"
 msgstr[1] "%n pastas"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n arquivo"
@@ -229,25 +229,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Encriptação foi desabilitada mas seus arquivos continuam encriptados. Por favor vá a suas configurações pessoais para descriptar seus arquivos."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "Erro movendo o arquivo"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Modificado"
 
@@ -256,7 +256,7 @@ msgstr "Modificado"
 msgid "%s could not be renamed"
 msgstr "%s não pode ser renomeado"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Upload"
 
@@ -292,65 +292,65 @@ msgstr "Tamanho máximo para arquivo ZIP"
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Novo"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Arquivo texto"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Pasta"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Do link"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Arquivos apagados"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Cancelar upload"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Você não possui permissão de escrita aqui."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Nada aqui.Carrege alguma coisa!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Descompartilhar"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Excluir"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Upload muito grande"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Arquivos sendo escaneados, por favor aguarde."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Scanning atual"
 
diff --git a/l10n/pt_BR/files_encryption.po b/l10n/pt_BR/files_encryption.po
index 81c0e4715e55e55c064a79e9b3e3f2135b7e2c5d..c4ec8f7f570840e4283e3d52c2c9822a43b83b3f 100644
--- a/l10n/pt_BR/files_encryption.po
+++ b/l10n/pt_BR/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -56,14 +56,14 @@ msgid ""
 "correct."
 msgstr "Não foi possível atualizar a senha de chave privada. Talvez a senha antiga esteja incorreta."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
-msgstr ""
+msgstr "Aplicativo de criptografia não foi inicializado! Talvez o aplicativo de criptografia tenha sido reativado durante essa sessão. Por favor, tente fazer logoff e login novamente para inicializar o aplicativo de criptografia."
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -71,6 +71,18 @@ msgid ""
 "files."
 msgstr "Sua chave privada não é válida! Provavelmente sua senha foi alterada fora do sistema ownCloud (por exemplo, seu diretório corporativo). Você pode atualizar sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados."
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "Requisitos não encontrados."
@@ -82,7 +94,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Por favor, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado."
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "Seguintes usuários não estão configurados para criptografia:"
 
@@ -92,97 +104,97 @@ msgstr "Salvando..."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
-msgstr ""
+msgstr "Ir diretamente para o seu"
 
 #: templates/invalid_private_key.php:8
 msgid "personal settings"
 msgstr "configurações pessoais."
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Criptografia"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Habilitar chave de recuperação (permite recuperar arquivos de usuários em caso de perda de senha):"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "Senha da chave de recuperação"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
-msgstr ""
+msgstr "Repita Recuperação de senha da chave"
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Desabilitado"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "Mudar a senha da chave de recuperação:"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "Senha antiga da chave de recuperação"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "Nova senha da chave de recuperação"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
-msgstr ""
+msgstr "Repita Nova senha da chave de recuperação"
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Trocar Senha"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Sua senha de chave privada não coincide mais com sua senha de login:"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "Configure sua antiga senha de chave privada para sua atual senha de login."
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Se você não se lembra de sua antiga senha você pode pedir ao administrador que recupere seus arquivos."
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Senha antiga de login"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Senha de login atual"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "Atualizar senha de chave privada"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Habilitar recuperação de senha:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Habilitar essa opção vai permitir que você obtenha novamente acesso aos seus arquivos encriptados em caso de perda de senha"
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "Configurações de recuperação de arquivo atualizado"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "Não foi possível atualizar a recuperação de arquivos"
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index 0c110ef8250e79718ce737ccb773f5c520793d9b..dd4786689109a5c33657f475ef53595f671d3244 100644
--- a/l10n/pt_BR/files_sharing.po
+++ b/l10n/pt_BR/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 09:40+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr "Este compartilhamento esta protegido por senha"
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "Senha incorreta. Tente novamente."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Senha"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Submeter"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Desculpe, este link parece não mais  funcionar."
@@ -54,28 +54,28 @@ msgstr "compartilhamento está desativada"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Para mais informações, por favor, pergunte a pessoa que enviou este link."
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s compartilhou a pasta %s com você"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s compartilhou o arquivo %s com você"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Upload"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Cancelar upload"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Nenhuma visualização disponível para"
diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po
index 52e3fe9e136c3e46803e0f1a63bbbea09712dbc1..c86485d45e4b9adf1f3e323d77f839e159893a08 100644
--- a/l10n/pt_BR/files_trashbin.po
+++ b/l10n/pt_BR/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -28,42 +28,10 @@ msgstr "Não foi possível excluir %s permanentemente"
 msgid "Couldn't restore %s"
 msgstr "Não foi possível restaurar %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "realizar operação de restauração"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Erro"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "excluir arquivo permanentemente"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Excluir permanentemente"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Nome"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Excluído"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] "%n pastas"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n arquivo"
-msgstr[1] "%n arquivos"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "restaurado"
@@ -72,11 +40,19 @@ msgstr "restaurado"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Nada aqui. Sua lixeira está vazia!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Nome"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Restaurar"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Excluído"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Excluir"
 
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index 8893e2eddea7bc1d36d6af79eb53e6a5e3a9e670..537f29e4f8c9497bbdccb17255a675e3e279a60f 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 09:40+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -370,14 +370,18 @@ msgid ""
 msgstr "Por padrão, o atributo UUID é detectado automaticamente. O atributo UUID é usado para identificar, sem dúvidas, os usuários e grupos LDAP. Além disso, o nome de usuário interno será criado com base no UUID, se não especificado acima. Você pode substituir a configuração e passar um atributo de sua escolha. Você deve certificar-se de que o atributo de sua escolha pode ser lido tanto para usuários como para grupos, e que seja único. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas para usuários e grupos LDAP recém mapeados (adicionados)."
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "Atributo UUID:"
+msgid "UUID Attribute for Users:"
+msgstr "UUID Atributos para Usuários:"
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr "UUID Atributos para Grupos:"
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "Usuário-LDAP Mapeamento de Usuário"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -391,18 +395,18 @@ msgid ""
 "experimental stage."
 msgstr "Nomes de usuários sãi usados para armazenar e atribuir (meta) dados. A fim de identificar com precisão e reconhecer usuários, cada usuário LDAP terá um nome de usuário interno. Isso requer um mapeamento nome de usuário para usuário LDAP. O nome de usuário criado é mapeado para o UUID do usuário LDAP. Adicionalmente, o DN fica em cache, assim como para reduzir a interação LDAP, mas não é utilizado para a identificação. Se o DN muda, as mudanças serão encontradas. O nome de usuário interno é utilizado em todo lugar. Limpar os mapeamentos não influencia a configuração. Limpar os mapeamentos deixará rastros em todo lugar. Limpar os mapeamentos não influencia a configuração, mas afeta as configurações LDAP! Somente limpe os mapeamentos em embiente de testes ou em estágio experimental."
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Limpar Mapeamento de Usuário Nome de Usuário-LDAP"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Limpar NomedoGrupo-LDAP Mapeamento do Grupo"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Teste de Configuração"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 140ca75e362e1ca8ed69c4707b28d3f3a5b455bc..d21be2dcf19183d2d8166a11825217b516bdcec1 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -61,45 +61,6 @@ msgstr "Actualizado o cache dos ficheiros"
 msgid "... %d%% done ..."
 msgstr "... %d%% feito ..."
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Tipo de categoria não fornecido"
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Nenhuma categoria para adicionar?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "A categoria já existe: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Tipo de objecto não fornecido"
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "ID %s não fornecido"
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Erro a adicionar %s aos favoritos"
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Nenhuma categoria seleccionada para eliminar."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Erro a remover %s dos favoritos."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Não foi selecionado nenhum ficheiro para importar"
@@ -316,27 +277,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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 "O tipo de objecto não foi especificado"
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Erro"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "O nome da aplicação não foi especificado"
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "O ficheiro necessário {file} não está instalado!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Partilhado"
@@ -345,7 +285,12 @@ msgstr "Partilhado"
 msgid "Share"
 msgstr "Partilhar"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Erro"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Erro ao partilhar"
 
@@ -377,7 +322,7 @@ msgstr "Partilhar com link"
 msgid "Password protect"
 msgstr "Proteger com palavra-passe"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Password"
 
@@ -449,30 +394,58 @@ msgstr "apagar"
 msgid "share"
 msgstr "partilhar"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Protegido com palavra-passe"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Erro ao retirar a data de expiração"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Erro ao aplicar a data de expiração"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "A Enviar..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "E-mail enviado"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Aviso"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "O tipo de objecto não foi especificado"
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Eliminar"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Adicionar"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -509,7 +482,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Vai receber um endereço para repor a sua password"
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Nome de utilizador"
 
@@ -553,7 +526,7 @@ msgstr "Pessoal"
 msgid "Users"
 msgstr "Utilizadores"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Aplicações"
 
@@ -565,6 +538,34 @@ msgstr "Admin"
 msgid "Help"
 msgstr "Ajuda"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Acesso interdito"
@@ -594,14 +595,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Editar categorias"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Adicionar"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -691,12 +684,12 @@ msgstr "Acabar instalação"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s está disponível. Tenha mais informações como actualizar."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Sair"
 
@@ -714,19 +707,27 @@ msgstr "Se não mudou a sua palavra-passe recentemente, a sua conta pode ter sid
 msgid "Please change your password to secure your account again."
 msgstr "Por favor mude a sua palavra-passe para assegurar a sua conta de novo."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Esqueceu-se da sua password?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "lembrar"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Entrar"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Contas de acesso alternativas"
 
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index c666456742a53fd276b66f9745fab15aceece2db..fd6ec2c75ede7c94d44b1bc0e9b91bdf30ce999c 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+0000\n"
+"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\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"
@@ -77,15 +77,15 @@ msgstr "Falhou a escrita no disco"
 msgid "Not enough storage available"
 msgstr "Não há espaço suficiente em disco"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
-msgstr ""
+msgstr "O carregamento falhou. Não foi possível obter a informação do ficheiro."
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Directório Inválido"
 
@@ -93,36 +93,36 @@ msgstr "Directório Inválido"
 msgid "Files"
 msgstr "Ficheiros"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Espaço em disco insuficiente!"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
-msgstr ""
+msgstr "Não foi possível obter o resultado do servidor."
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "O URL não pode estar vazio."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Nome da pasta inválido. Palavra 'Shared' é reservado pela ownCloud"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Erro"
 
@@ -134,7 +134,7 @@ msgstr "Partilhar"
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Renomear"
 
@@ -166,13 +166,13 @@ msgstr "substituido {new_name} por {old_name}"
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n pasta"
 msgstr[1] "%n pastas"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n ficheiro"
@@ -229,25 +229,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "A encriptação foi desactivada mas os seus ficheiros continuam encriptados.  Por favor consulte as suas definições pessoais para desencriptar os ficheiros."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
-msgstr ""
+msgstr "Erro ao mover o ficheiro"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Modificado"
 
@@ -256,7 +256,7 @@ msgstr "Modificado"
 msgid "%s could not be renamed"
 msgstr "%s não pode ser renomeada"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Carregar"
 
@@ -292,65 +292,65 @@ msgstr "Tamanho máximo para ficheiros ZIP"
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Novo"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Ficheiro de texto"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Pasta"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Da ligação"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Ficheiros eliminados"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Cancelar envio"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Não tem permissões de escrita aqui."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Vazio. Envie alguma coisa!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Deixar de partilhar"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Upload muito grande"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Os ficheiros estão a ser analisados, por favor aguarde."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Análise actual"
 
diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po
index d3d1dddf322d953408879e39b2b79464532bbccd..c5dbfe3bce6f2b8a9b8f1b3fee565c93450496fe 100644
--- a/l10n/pt_PT/files_encryption.po
+++ b/l10n/pt_PT/files_encryption.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Mouxy <daniel@mouxy.net>, 2013
+# Duarte Velez Grilo <duartegrilo@gmail.com>, 2013
 # moura232 <moura232@gmail.com>, 2013
 # Helder Meneses <helder.meneses@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -56,14 +57,14 @@ msgid ""
 "correct."
 msgstr "Não foi possível alterar a chave. Possivelmente a password antiga não está correcta."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -71,6 +72,18 @@ msgid ""
 "files."
 msgstr "Chave privada não é válida! Provavelmente senha foi alterada fora do sistema ownCloud (exemplo, o diretório corporativo). Pode atualizar password da chave privada em configurações personalizadas para recuperar o acesso aos seus arquivos encriptados."
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "Faltam alguns requisitos."
@@ -82,9 +95,9 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Os utilizadores seguintes não estão marcados para cifragem:"
 
 #: js/settings-admin.js:13
 msgid "Saving..."
@@ -98,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "configurações personalizadas "
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Encriptação"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Active a chave de recuperação (permite recuperar os ficheiros no caso de perda da password):"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "Chave de recuperação da conta"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Activado"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "Alterar a chave de recuperação:"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "Chave anterior de recuperação da conta"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "Nova chave de recuperação da conta"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Mudar a Password"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Password anterior da conta"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Password actual da conta"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "ativar recuperação do password:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Ao activar esta opção, tornar-lhe-a possível a obtenção de acesso aos seus ficheiros encriptados caso perca a password."
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "Actualizadas as definições de recuperação de ficheiros"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "Não foi possível actualizar a recuperação de ficheiros"
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index 7db55d8e767733f17c67b6db5ae47f279e975f10..007a73ccd8a7f1dd74c850d18a2db2d9339baa69 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/files_sharing.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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -20,17 +20,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "Password errada, por favor tente de novo"
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Password"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Submeter"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Desculpe, mas este link parece não estar a funcionar."
@@ -55,28 +55,28 @@ msgstr "A partilha está desativada"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Para mais informações, por favor questione a pessoa que lhe enviou este link"
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s partilhou a pasta %s consigo"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s partilhou o ficheiro %s consigo"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Carregar"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Cancelar envio"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Não há pré-visualização para"
diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po
index 8b46018dda5c76a1481255c8649beb62dd3c35d3..8ac67966c214914e3923eb1cc3251e86e2cc1fc3 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -28,42 +28,10 @@ msgstr "Não foi possível eliminar %s de forma permanente"
 msgid "Couldn't restore %s"
 msgstr "Não foi possível restaurar %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "executar a operação de restauro"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Erro"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "Eliminar permanentemente o(s) ficheiro(s)"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Eliminar permanentemente"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Nome"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Apagado"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n pasta"
-msgstr[1] "%n pastas"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n ficheiro"
-msgstr[1] "%n ficheiros"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "Restaurado"
@@ -72,11 +40,19 @@ msgstr "Restaurado"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Não hà ficheiros. O lixo está vazio!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Nome"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Restaurar"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Apagado"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Eliminar"
 
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index a33b04b63e02ee333160a6ea7adeb375b9532e6f..b6b6fdc0a1341d000041c4adc81b6b1bbd7df05e 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-09 18:00+0000\n"
+"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\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,38 +18,38 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:237
+#: private/app.php:243
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "A aplicação \"%s\" não pode ser instaladas por não ser compatível com esta versão da ownCloud."
 
-#: private/app.php:248
+#: private/app.php:254
 msgid "No app name specified"
-msgstr ""
+msgstr "O nome da aplicação não foi especificado"
 
-#: private/app.php:352
+#: private/app.php:359
 msgid "Help"
 msgstr "Ajuda"
 
-#: private/app.php:365
+#: private/app.php:372
 msgid "Personal"
 msgstr "Pessoal"
 
-#: private/app.php:376
+#: private/app.php:383
 msgid "Settings"
 msgstr "Configurações"
 
-#: private/app.php:388
+#: private/app.php:395
 msgid "Users"
 msgstr "Utilizadores"
 
-#: private/app.php:401
+#: private/app.php:408
 msgid "Admin"
 msgstr "Admin"
 
-#: private/app.php:832
+#: private/app.php:839
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "A actualização \"%s\" falhou."
@@ -112,7 +112,7 @@ msgstr ""
 #: private/installer.php:89
 #, php-format
 msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Arquivos do tipo %s não são suportados"
 
 #: private/installer.php:103
 msgid "Failed to open archive when installing app"
@@ -120,11 +120,11 @@ msgstr ""
 
 #: private/installer.php:125
 msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "A aplicação não disponibiliza um ficheiro info.xml"
 
 #: private/installer.php:131
 msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "A aplicação não pode ser instalado devido a código não permitido dentro da aplicação"
 
 #: private/installer.php:140
 msgid ""
@@ -146,12 +146,12 @@ msgstr ""
 
 #: private/installer.php:162
 msgid "App directory already exists"
-msgstr ""
+msgstr "A directoria da aplicação já existe"
 
 #: private/installer.php:175
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Não foi possível criar a pasta da aplicação. Por favor verifique as permissões. %s"
 
 #: private/json.php:28
 msgid "Application is not enabled"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index c2dd6570065cd4ac9f0063c5151a8acc1315a98f..a9e185d7607bba2710535a962252586db4e63cc2 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -5,15 +5,16 @@
 # Translators:
 # bmgmatias <bmgmatias@gmail.com>, 2013
 # Mouxy <daniel@mouxy.net>, 2013
+# Duarte Velez Grilo <duartegrilo@gmail.com>, 2013
 # Helder Meneses <helder.meneses@gmail.com>, 2013
 # Nelson Rosado <nelsontrosado@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-09 17:50+0000\n"
+"Last-Translator: Duarte Velez Grilo <duartegrilo@gmail.com>\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"
@@ -90,22 +91,22 @@ msgstr "Não foi possível actualizar a aplicação."
 
 #: changepassword/controller.php:20
 msgid "Wrong password"
-msgstr ""
+msgstr "Password errada"
 
 #: changepassword/controller.php:42
 msgid "No user supplied"
-msgstr ""
+msgstr "Nenhum utilizador especificado."
 
 #: changepassword/controller.php:74
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
-msgstr ""
+msgstr "Por favor forneça uma palavra chave de recuperação de administrador, caso contrário todos os dados de utilizador serão perdidos"
 
 #: changepassword/controller.php:79
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
-msgstr ""
+msgstr "Palavra chave de recuperação de administrador errada. Por favor verifique a palavra chave e tente de novo."
 
 #: changepassword/controller.php:87
 msgid ""
@@ -115,7 +116,7 @@ msgstr ""
 
 #: changepassword/controller.php:92 changepassword/controller.php:103
 msgid "Unable to change password"
-msgstr ""
+msgstr "Não foi possível alterar a sua password"
 
 #: js/apps.js:43
 msgid "Update to {appversion}"
@@ -163,7 +164,7 @@ msgstr "Actualizado"
 
 #: js/personal.js:225
 msgid "Select a profile picture"
-msgstr ""
+msgstr "Seleccione uma fotografia de perfil"
 
 #: js/personal.js:270
 msgid "Decrypting files... Please wait, this can take some time."
@@ -185,32 +186,32 @@ msgstr "desfazer"
 msgid "Unable to remove user"
 msgstr "Não foi possível remover o utilizador"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: js/users.js:95 templates/users.php:26 templates/users.php:90
 #: templates/users.php:118
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:97 templates/users.php:92 templates/users.php:130
+#: js/users.js:100 templates/users.php:92 templates/users.php:130
 msgid "Group Admin"
 msgstr "Grupo Administrador"
 
-#: js/users.js:120 templates/users.php:170
+#: js/users.js:123 templates/users.php:170
 msgid "Delete"
 msgstr "Eliminar"
 
-#: js/users.js:277
+#: js/users.js:280
 msgid "add group"
 msgstr "Adicionar grupo"
 
-#: js/users.js:436
+#: js/users.js:442
 msgid "A valid username must be provided"
 msgstr "Um nome de utilizador válido deve ser fornecido"
 
-#: js/users.js:437 js/users.js:443 js/users.js:458
+#: js/users.js:443 js/users.js:449 js/users.js:464
 msgid "Error creating user"
 msgstr "Erro a criar utilizador"
 
-#: js/users.js:442
+#: js/users.js:448
 msgid "A valid password must be provided"
 msgstr "Uma password válida deve ser fornecida"
 
@@ -346,11 +347,11 @@ msgstr "Permitir que os utilizadores partilhem somente com utilizadores do seu g
 
 #: templates/admin.php:170
 msgid "Allow mail notification"
-msgstr ""
+msgstr "Permitir notificação por email"
 
 #: templates/admin.php:171
 msgid "Allow user to send mail notification for shared files"
-msgstr ""
+msgstr "Permitir que o utilizador envie notificações por correio electrónico para ficheiros partilhados"
 
 #: templates/admin.php:178
 msgid "Security"
@@ -505,19 +506,19 @@ msgstr "Foto do perfil"
 
 #: templates/personal.php:90
 msgid "Upload new"
-msgstr ""
+msgstr "Carregar novo"
 
 #: templates/personal.php:92
 msgid "Select new from Files"
-msgstr ""
+msgstr "Seleccionar novo a partir dos ficheiros"
 
 #: templates/personal.php:93
 msgid "Remove image"
-msgstr ""
+msgstr "Remover imagem"
 
 #: templates/personal.php:94
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
+msgstr "Apenas png ou jpg. Idealmente quadrada, mas poderá corta-la depois."
 
 #: templates/personal.php:97
 msgid "Abort"
@@ -525,7 +526,7 @@ msgstr "Abortar"
 
 #: templates/personal.php:98
 msgid "Choose as profile image"
-msgstr ""
+msgstr "Escolha uma fotografia de perfil"
 
 #: templates/personal.php:106 templates/personal.php:107
 msgid "Language"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index b8a52a7e0eb10d35a9b341f71a11d32bc678feda..304a64da0946fee5f13fb6345c02bcba0deb4f90 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -371,14 +371,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "Atributo UUID:"
+msgid "UUID Attribute for Users:"
+msgstr ""
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "Mapeamento do utilizador LDAP"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -392,18 +396,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Limpar mapeamento do utilizador-LDAP"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Limpar o mapeamento do nome de grupo LDAP"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Testar a configuração"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index f926d7d859a216c4cf51c4237955b6ab1457f0ff..147d260a9cb9ea076e972766377bb537f3c39ad6 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -60,45 +60,6 @@ msgstr ""
 msgid "... %d%% done ..."
 msgstr ""
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Tipul de categorie nu a fost specificat."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Nici o categorie de adăugat?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Această categorie deja există: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Tipul obiectului nu este prevăzut"
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "ID-ul %s nu a fost introdus"
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Eroare la adăugarea %s la favorite."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Nicio categorie selectată pentru ștergere."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Eroare la ștergerea %s din favorite."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -320,27 +281,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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 "Tipul obiectului nu este specificat."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Eroare"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Numele aplicației nu este specificat."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Fișierul obligatoriu {file} nu este instalat!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Partajat"
@@ -349,7 +289,12 @@ msgstr "Partajat"
 msgid "Share"
 msgstr "Partajează"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Eroare"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Eroare la partajare"
 
@@ -381,7 +326,7 @@ msgstr "Partajare cu legătură"
 msgid "Password protect"
 msgstr "Protejare cu parolă"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Parolă"
 
@@ -453,30 +398,58 @@ msgstr "ștergere"
 msgid "share"
 msgstr "partajare"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Protejare cu parolă"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Eroare la anularea datei de expirare"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Eroare la specificarea datei de expirare"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Se expediază..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Mesajul a fost expediat"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Atenție"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Tipul obiectului nu este specificat."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Șterge"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Adaugă"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -513,7 +486,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Vei primi un mesaj prin care vei putea reseta parola via email."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Nume utilizator"
 
@@ -557,7 +530,7 @@ msgstr "Personal"
 msgid "Users"
 msgstr "Utilizatori"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Aplicații"
 
@@ -569,6 +542,34 @@ msgstr "Administrator"
 msgid "Help"
 msgstr "Ajutor"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Acces restricționat"
@@ -598,14 +599,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Editează categorii"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Adaugă"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -695,12 +688,12 @@ msgstr "Finalizează instalarea"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s este disponibil. Vezi mai multe informații despre procesul de actualizare."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Ieșire"
 
@@ -718,19 +711,27 @@ msgstr "Dacă nu ți-ai schimbat parola recent, contul tău ar putea fi compromi
 msgid "Please change your password to secure your account again."
 msgstr "Te rog schimbă-ți parola pentru a-ți securiza din nou contul."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Ai uitat parola?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "amintește"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Autentificare"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Conectări alternative"
 
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 7e5f1c083b93dac0fb10ee5f7f6261bc614cccff..20d06128381b276a89ad92fa111b8cb54eb6bc68 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -79,15 +79,15 @@ msgstr "Eroare la scrierea discului"
 msgid "Not enough storage available"
 msgstr "Nu este suficient spațiu disponibil"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr "Încărcare eșuată. Nu se pot obține informații despre fișier."
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Încărcare eșuată. Nu se poate găsi fișierul încărcat"
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "registru invalid."
 
@@ -95,36 +95,36 @@ msgstr "registru invalid."
 msgid "Files"
 msgstr "Fișiere"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Nu se poate încărca {filename} deoarece este un director sau are mărimea de 0 octeți"
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Nu este suficient spațiu disponibil"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Încărcare anulată."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr "Nu se poate obține rezultatul de la server."
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "Adresa URL nu poate fi golita"
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Nume de dosar invalid. Utilizarea 'Shared' e rezervată de ownCloud"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Eroare"
 
@@ -136,7 +136,7 @@ msgstr "a imparti"
 msgid "Delete permanently"
 msgstr "Stergere permanenta"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Redenumire"
 
@@ -168,14 +168,14 @@ msgstr "{new_name} inlocuit cu {old_name}"
 msgid "undo"
 msgstr "Anulează ultima acțiune"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n director"
 msgstr[1] "%n directoare"
 msgstr[2] "%n directoare"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fișier"
@@ -234,25 +234,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "criptarea a fost disactivata dar fisierele sant inca criptate.va rog intrati in setarile personale pentru a decripta fisierele"
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "in curs de descarcare. Aceasta poate să dureze ceva timp dacă fișierele sunt mari."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "Eroare la mutarea fișierului"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Nume"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Dimensiune"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Modificat"
 
@@ -261,7 +261,7 @@ msgstr "Modificat"
 msgid "%s could not be renamed"
 msgstr "%s nu a putut fi redenumit"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Încărcare"
 
@@ -297,65 +297,65 @@ msgstr "Dimensiunea maximă de intrare pentru fișiere compresate"
 msgid "Save"
 msgstr "Salvează"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nou"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "lista"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Dosar"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "de la adresa"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Sterge fisierele"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Anulează încărcarea"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Nu ai permisiunea de a scrie aici."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Nimic aici. Încarcă ceva!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Descarcă"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Anulare"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Șterge"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Fișierul încărcat este prea mare"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Fișierele sunt scanate, asteptati va rog"
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "În curs de scanare"
 
diff --git a/l10n/ro/files_encryption.po b/l10n/ro/files_encryption.po
index 6b54b6bee88b98af0f980db797ab40926b7f39c7..d7b085091bc21bb393173ca70ecf697c1211160b 100644
--- a/l10n/ro/files_encryption.po
+++ b/l10n/ro/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Încriptare"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index e0a966d6e0fe66e8f0e35dc260f30903221e6bd6..780d4a0405f5c86366850b21acaf36346dc9fb1b 100644
--- a/l10n/ro/files_sharing.po
+++ b/l10n/ro/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "Parola este incorectă. Încercaţi din nou."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Parolă"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Trimite"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -54,28 +54,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s a partajat directorul %s cu tine"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s a partajat fișierul %s cu tine"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Descarcă"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Încărcare"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Anulează încărcarea"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Nici o previzualizare disponibilă pentru "
diff --git a/l10n/ro/files_trashbin.po b/l10n/ro/files_trashbin.po
index e8bdca36ee95a687f31034ab6956a952dc768e67..28f35cd800b949c05db515c3c221b8db5183c0cf 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -27,44 +27,10 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Eroare"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Stergere permanenta"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Nume"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] "%n directoare"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] "%n fișiere"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -73,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Nume"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Șterge"
 
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 239ee5cccc99d7b8c3d805c3a831e25b8454b1d3..01f2787f6ba2e7825ca512555ade4e2e5775ed51 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Ajutor"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index d3ff4ab2aa150f7c7e6fa0902b176f612aeafc4d..a02c5ffa5f5b83f576a85fbdb3eb5710b6a36be0 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -68,45 +68,6 @@ msgstr "Обновлен файловый кэш"
 msgid "... %d%% done ..."
 msgstr "... %d%% завершено ..."
 
-#: 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 "Эта категория уже существует: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Тип объекта не предоставлен"
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "ID %s не  предоставлен"
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Ошибка добавления %s в избранное"
-
-#: 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 "Ошибка удаления %s из избранного"
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Не указано изображение или файл"
@@ -328,27 +289,6 @@ msgstr "({count} выбрано)"
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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 "Необходимый файл {file} не установлен!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Общие"
@@ -357,7 +297,12 @@ msgstr "Общие"
 msgid "Share"
 msgstr "Открыть доступ"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Ошибка"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Ошибка при открытии доступа"
 
@@ -389,7 +334,7 @@ msgstr "Поделиться с ссылкой"
 msgid "Password protect"
 msgstr "Защитить паролем"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Пароль"
 
@@ -461,30 +406,58 @@ msgstr "удалить"
 msgid "share"
 msgstr "открыть доступ"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Защищено паролем"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Ошибка при отмене срока доступа"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Ошибка при установке срока доступа"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Отправляется ..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Письмо отправлено"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Предупреждение"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Тип объекта не указан"
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Удалить"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Добавить"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -521,7 +494,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "На ваш адрес Email выслана ссылка для сброса пароля."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Имя пользователя"
 
@@ -565,7 +538,7 @@ msgstr "Личное"
 msgid "Users"
 msgstr "Пользователи"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Приложения"
 
@@ -577,6 +550,34 @@ msgstr "Админпанель"
 msgid "Help"
 msgstr "Помощь"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Доступ запрещён"
@@ -606,14 +607,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Редактировать категрии"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Добавить"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -703,12 +696,12 @@ msgstr "Завершить установку"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s доступно. Получить дополнительную информацию о порядке обновления."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Выйти"
 
@@ -726,19 +719,27 @@ msgstr "Если Вы недавно не меняли свой пароль, т
 msgid "Please change your password to secure your account again."
 msgstr "Пожалуйста, смените пароль, чтобы обезопасить свою учетную запись."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Забыли пароль?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "запомнить"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Войти"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Альтернативные имена пользователя"
 
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 9c2d7f4428a508d02dcf447b057d99689984124c..94d28f0a7a1d5c97a4ebe0571a812322360c2ad4 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -81,15 +81,15 @@ msgstr "Ошибка записи на диск"
 msgid "Not enough storage available"
 msgstr "Недостаточно доступного места в хранилище"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr "Загрузка не удалась. Невозможно получить информацию о файле"
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Загрузка не удалась. Невозможно найти загруженный файл"
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Неправильный каталог."
 
@@ -97,36 +97,36 @@ msgstr "Неправильный каталог."
 msgid "Files"
 msgstr "Файлы"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Невозможно загрузить файл  {filename} так как он является директорией либо имеет размер 0 байт"
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Недостаточно свободного места"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Загрузка отменена."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr "Не получен ответ от сервера"
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "Ссылка не может быть пустой."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано."
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Ошибка"
 
@@ -138,7 +138,7 @@ msgstr "Открыть доступ"
 msgid "Delete permanently"
 msgstr "Удалено навсегда"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Переименовать"
 
@@ -170,14 +170,14 @@ msgstr "заменено {new_name} на {old_name}"
 msgid "undo"
 msgstr "отмена"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n папка"
 msgstr[1] "%n папки"
 msgstr[2] "%n папок"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n файл"
@@ -236,25 +236,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Шифрование было отключено, но ваши файлы все еще зашифрованы. Пожалуйста, зайдите на страницу персональных настроек для того, чтобы расшифровать ваши файлы."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Загрузка началась. Это может потребовать много времени, если файл большого размера."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "Ошибка при перемещении файла"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Имя"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Изменён"
 
@@ -263,7 +263,7 @@ msgstr "Изменён"
 msgid "%s could not be renamed"
 msgstr "%s не может быть переименован"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Загрузка"
 
@@ -299,65 +299,65 @@ msgstr "Максимальный исходный размер для ZIP фай
 msgid "Save"
 msgstr "Сохранить"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Новый"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Текстовый файл"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Папка"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Из ссылки"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Удалённые файлы"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Отмена загрузки"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "У вас нет разрешений на запись здесь."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Здесь ничего нет. Загрузите что-нибудь!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Скачать"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Закрыть общий доступ"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Удалить"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Файл слишком велик"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файлы, которые вы пытаетесь загрузить, превышают лимит для файлов на этом сервере."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Подождите, файлы сканируются."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Текущее сканирование"
 
diff --git a/l10n/ru/files_encryption.po b/l10n/ru/files_encryption.po
index a991edf46729756fab14b01496b391bac20c5e04..b4de0e9d50eb1afc46d339f315e923e5f2129406 100644
--- a/l10n/ru/files_encryption.po
+++ b/l10n/ru/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -59,14 +59,14 @@ msgid ""
 "correct."
 msgstr "Невозможно обновить пароль от секретного ключа. Возможно, старый пароль указан неверно."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -74,6 +74,18 @@ msgid ""
 "files."
 msgstr "Ваш секретный ключ не действителен! Вероятно, ваш пароль был изменен вне системы OwnCloud (например, корпоративный каталог). Вы можете обновить секретный ключ в личных настройках на странице восстановления доступа к зашифрованным файлам. "
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "Требования отсутствуют."
@@ -85,7 +97,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Пожалуйста, убедитесь, что версия PHP 5.3.3 или новее, а также, что OpenSSL и соответствующее расширение PHP включены и правильно настроены. На данный момент приложение шифрования отключено."
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "Для следующих пользователей шифрование не настроено:"
 
@@ -101,91 +113,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "персональные настройки"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Шифрование"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Включить ключ восстановления (позволяет пользователям восстановить файлы при потере пароля):"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "Пароль для ключа восстановления"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Включено"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Отключено"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "Сменить пароль для ключа восстановления:"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "Старый пароль для ключа восстановления"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "Новый пароль для ключа восстановления"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Изменить пароль"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Пароль от секретного ключа больше не соответствует паролю входа:"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "Замените старый пароль от секретного ключа на новый пароль входа."
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Если вы не помните свой старый пароль, вы можете попросить своего администратора восстановить ваши файлы"
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Старый пароль для входа"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Текущйи пароль для входа"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "Обновить пароль от секретного ключа"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Включить восстановление пароля:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Включение этой опции позволит вам получить доступ к своим зашифрованным файлам в случае утери пароля"
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "Настройки файла восстановления обновлены"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "Невозможно обновить файл восстановления"
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index 13ded27e566458e29c5128f7f03006aaf0aa3905..6c397612304f3938ee6bbbd65177cdf12ddbc5aa 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
-"Last-Translator: Den4md <denstarr@mail.md>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,17 +20,17 @@ msgstr ""
 "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"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "Неверный пароль. Попробуйте еще раз."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Отправить"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "К сожалению, эта ссылка, похоже не будет работать больше."
@@ -55,28 +55,28 @@ msgstr "обмен отключен"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Для получения дополнительной информации, пожалуйста, спросите того кто отослал данную ссылку."
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s открыл доступ к папке %s для Вас"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s открыл доступ к файлу %s для Вас"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Скачать"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Загрузка"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Отмена загрузки"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Предпросмотр недоступен для"
diff --git a/l10n/ru/files_trashbin.po b/l10n/ru/files_trashbin.po
index 093a2f1502ca8604596aac52ee601b13b34bbbe5..168ee1bd7df2825c13cf95d364fd509851111d6e 100644
--- a/l10n/ru/files_trashbin.po
+++ b/l10n/ru/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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,44 +28,10 @@ msgstr "%s не может быть удалён навсегда"
 msgid "Couldn't restore %s"
 msgstr "%s не может быть восстановлен"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "выполнить операцию восстановления"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Ошибка"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "удалить файл навсегда"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Удалено навсегда"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Имя"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Удалён"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] "%n папок"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] "%n файлов"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "восстановлен"
@@ -74,11 +40,19 @@ msgstr "восстановлен"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Здесь ничего нет. Ваша корзина пуста!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Имя"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Восстановить"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Удалён"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Удалить"
 
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index c89b78bf54c3d619bb6db020e7f00db61b295560..fa2d45416fcfaf160057e4828428a3c38036f9df 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: jekader <jekader@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -373,14 +373,18 @@ msgid ""
 msgstr "По-умолчанию, ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно индентифицировать пользователей и группы LDAP. Также, на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по-умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP."
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "Аттрибут для UUID:"
+msgid "UUID Attribute for Users:"
+msgstr ""
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "Соответствия Имя-Пользователь LDAP"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -394,18 +398,18 @@ msgid ""
 "experimental stage."
 msgstr "ownCloud использует имена пользователей для хранения и назначения метаданных. Для точной идентификации и распознавания пользователей, каждый пользователь LDAP будет иметь свое внутреннее имя пользователя. Это требует привязки имени пользователя ownCloud к пользователю LDAP. При создании имя пользователя назначается идентификатору UUID пользователя LDAP. Помимо этого кешируется доменное имя (DN) для уменьшения числа обращений к LDAP, однако оно не используется для идентификации. Если доменное имя было изменено, об этом станет известно ownCloud. Внутреннее имя ownCloud используется повсеместно в ownCloud. После сброса привязок в базе могут сохраниться остатки старой информации. Сброс привязок не привязан к конфигурации, он повлияет на все LDAP подключения! Ни в коем случае не рекомендуется сбрасывать привязки если система уже находится в эксплуатации, только на этапе тестирования."
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Очистить соответствия Имя-Пользователь LDAP"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Очистить соответствия Группа-Группа LDAP"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Тестовая конфигурация"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Помощь"
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index 132a607f50d94eac645932d7f22c19e7bdda4aa9..5fb68acab6c43ef2d610832e605ed3842bbbe702 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -311,27 +272,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -340,7 +280,12 @@ msgstr ""
 msgid "Share"
 msgstr "බෙදා හදා ගන්න"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "දෝෂයක්"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -372,7 +317,7 @@ msgstr "යොමුවක් මඟින් බෙදාගන්න"
 msgid "Password protect"
 msgstr "මුර පදයකින් ආරක්ශාකරන්න"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "මුර පදය"
 
@@ -444,30 +389,58 @@ msgstr "මකන්න"
 msgid "share"
 msgstr "බෙදාහදාගන්න"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "මුර පදයකින් ආරක්ශාකර ඇත"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "අවවාදය"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "මකා දමන්න"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "එකතු කරන්න"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -504,7 +477,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "ඔබගේ මුරපදය ප්‍රත්‍යාරම්භ කිරීම සඳහා යොමුව විද්‍යුත් තැපෑලෙන් ලැබෙනු ඇත"
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "පරිශීලක නම"
 
@@ -548,7 +521,7 @@ msgstr "පෞද්ගලික"
 msgid "Users"
 msgstr "පරිශීලකයන්"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "යෙදුම්"
 
@@ -560,6 +533,34 @@ msgstr "පරිපාලක"
 msgid "Help"
 msgstr "උදව්"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "ඇතුල් වීම තහනම්"
@@ -589,14 +590,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "ප්‍රභේදයන් සංස්කරණය"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "එකතු කරන්න"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -686,12 +679,12 @@ msgstr "ස්ථාපනය කිරීම අවසන් කරන්න"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "නික්මීම"
 
@@ -709,19 +702,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "මුරපදය අමතකද?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "මතක තබාගන්න"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "ප්‍රවේශවන්න"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index b58a44be1fffcbd8b2dd37915d2fd1627fd61007..37ae590a0fbad64058d6f4765850f2ed2ecc63f0 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -74,15 +74,15 @@ msgstr "තැටිගත කිරීම අසාර්ථකයි"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr ""
 
@@ -90,36 +90,36 @@ msgstr ""
 msgid "Files"
 msgstr "ගොනු"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr ""
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "උඩුගත කිරීම අත් හරින්න ලදී"
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත"
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "යොමුව හිස් විය නොහැක"
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "දෝෂයක්"
 
@@ -131,7 +131,7 @@ msgstr "බෙදා හදා ගන්න"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "නැවත නම් කරන්න"
 
@@ -163,13 +163,13 @@ msgstr ""
 msgid "undo"
 msgstr "නිෂ්ප්‍රභ කරන්න"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -226,25 +226,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "නම"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "ප්‍රමාණය"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "වෙනස් කළ"
 
@@ -253,7 +253,7 @@ msgstr "වෙනස් කළ"
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "උඩුගත කරන්න"
 
@@ -289,65 +289,65 @@ msgstr "ZIP ගොනු සඳහා දැමිය හැකි උපරි
 msgid "Save"
 msgstr "සුරකින්න"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "නව"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "පෙළ ගොනුව"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "ෆෝල්ඩරය"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "යොමුවෙන්"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "උඩුගත කිරීම අත් හරින්න"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "බාන්න"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "නොබෙදු"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "මකා දමන්න"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "උඩුගත කිරීම විශාල වැඩිය"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය"
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න"
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "වර්තමාන පරික්ෂාව"
 
diff --git a/l10n/si_LK/files_encryption.po b/l10n/si_LK/files_encryption.po
index 2e754e8ef116ad64603877baa0c790730e4cb240..4dd66d0af599fc023fc7ae92068447d9da69b3d7 100644
--- a/l10n/si_LK/files_encryption.po
+++ b/l10n/si_LK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "ගුප්ත කේතනය"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po
index c09a00ba7075c57e22443824072611a5a88498fa..801702da65efe7a7381ebc4d6b47bef82b67c966 100644
--- a/l10n/si_LK/files_sharing.po
+++ b/l10n/si_LK/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "මුර පදය"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "යොමු කරන්න"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ඔබව %s ෆෝල්ඩරයට හවුල් කරගත්තේය"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ඔබ සමඟ %s ගොනුව බෙදාහදාගත්තේය"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "බාන්න"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "උඩුගත කරන්න"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "උඩුගත කිරීම අත් හරින්න"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "පූර්වදර්ශනයක් නොමැත"
diff --git a/l10n/si_LK/files_trashbin.po b/l10n/si_LK/files_trashbin.po
index 8ad799d100544863ff359a14abbb50e757115c6f..4e6567f2cbbced4bc3c45b5993b3eb775f2b7ae3 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,42 +27,10 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "දෝෂයක්"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr ""
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "නම"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -71,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "නම"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "මකා දමන්න"
 
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index 406b5ccaa25e5808aef90d436e376c0d8991d20b..d8967e9b4e809e3fa4f2fb82b402d051c6c9821f 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "උදව්"
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index 3638e7e767fc65e26b969fcaed2c1a174417de91..34140d817fbf1fe9f7e566ca6ec5db41eca0aebc 100644
--- a/l10n/sk/core.po
+++ b/l10n/sk/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -316,27 +277,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -345,7 +285,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr ""
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -377,7 +322,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr ""
 
@@ -449,30 +394,58 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -509,7 +482,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr ""
 
@@ -553,7 +526,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr ""
 
@@ -565,6 +538,34 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -594,14 +595,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr ""
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -691,12 +684,12 @@ msgstr ""
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr ""
 
@@ -714,19 +707,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/sk/files_encryption.po b/l10n/sk/files_encryption.po
index b09eb6f9b874d2fe449a5057a4a92f17a5a9bcbe..8f2fc35dc911361aba56b9faf8b832d87545497f 100644
--- a/l10n/sk/files_encryption.po
+++ b/l10n/sk/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/sk/files_sharing.po b/l10n/sk/files_sharing.po
index 42e2cda81b6b6a8f4864eee09a11994242d97034..2b6bf714e3d5d37ee409dee711237c18fca125e7 100644
--- a/l10n/sk/files_sharing.po
+++ b/l10n/sk/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-07-31 01:55-0400\n"
-"PO-Revision-Date: 2013-07-31 05:56+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
-msgid "Password"
+msgid "The password is wrong. Try again."
 msgstr ""
 
-#: templates/authenticate.php:9
-msgid "Submit"
+#: templates/authenticate.php:10
+msgid "Password"
 msgstr ""
 
 #: templates/part.404.php:3
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:85
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/sk/files_trashbin.po b/l10n/sk/files_trashbin.po
index 322a3dbd56e8c00adf754aa703e6ba9ca9f2c1fc..a6f8e0f6facc5436d968c039d532bc8da56605d9 100644
--- a/l10n/sk/files_trashbin.po
+++ b/l10n/sk/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -27,57 +27,31 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:100
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:36
-msgid "delete file permanently"
+#: lib/trashbin.php:814 lib/trashbin.php:816
+msgid "restored"
 msgstr ""
 
-#: js/trash.js:127
-msgid "Delete permanently"
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: js/trash.js:182 templates/index.php:17
+#: templates/index.php:23
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:183 templates/index.php:27
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:191
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/trash.js:197
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: lib/trash.php:819 lib/trash.php:821
-msgid "restored"
-msgstr ""
-
-#: templates/index.php:9
-msgid "Nothing in here. Your trash bin is empty!"
+#: templates/index.php:26 templates/index.php:28
+msgid "Restore"
 msgstr ""
 
-#: templates/index.php:20 templates/index.php:22
-msgid "Restore"
+#: templates/index.php:34
+msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:30 templates/index.php:31
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr ""
 
diff --git a/l10n/sk/user_ldap.po b/l10n/sk/user_ldap.po
index 0c3d5db2fe95a2162c242d741618a45c8fca5135..41f780a1d47b581ab467122d01002737b7d30da2 100644
--- a/l10n/sk/user_ldap.po
+++ b/l10n/sk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:36
+#: ajax/testConfiguration.php:37
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:39
+#: ajax/testConfiguration.php:40
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:43
+#: ajax/testConfiguration.php:44
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index a2ea5a4fb8647a6b76820fd2f713366c8ffcc396..384480517e431787dfc542674ab979a7f4cabba3 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -58,45 +58,6 @@ msgstr "\"Filecache\" aktualizovaná"
 msgid "... %d%% done ..."
 msgstr "... %d%% dokončených ..."
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Neposkytnutý typ kategórie."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Žiadna kategória pre pridanie?"
-
-#: ajax/vcategories/add.php:37
-#, 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
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Neposkytnutý typ objektu."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID neposkytnuté."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Chyba pri pridávaní %s do obľúbených položiek."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Neboli vybrané žiadne kategórie pre odstránenie."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Chyba pri odstraňovaní %s z obľúbených položiek."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -318,27 +279,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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 "Nešpecifikovaný typ objektu."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Chyba"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Nešpecifikované meno aplikácie."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Požadovaný súbor {file} nie je nainštalovaný!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Zdieľané"
@@ -347,7 +287,12 @@ msgstr "Zdieľané"
 msgid "Share"
 msgstr "Zdieľať"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Chyba"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Chyba počas zdieľania"
 
@@ -379,7 +324,7 @@ msgstr "Zdieľať cez odkaz"
 msgid "Password protect"
 msgstr "Chrániť heslom"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Heslo"
 
@@ -451,30 +396,58 @@ msgstr "vymazať"
 msgid "share"
 msgstr "zdieľať"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Chránené heslom"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Chyba pri odstraňovaní dátumu expirácie"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Chyba pri nastavení dátumu expirácie"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Odosielam ..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Email odoslaný"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Varovanie"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Nešpecifikovaný typ objektu."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Zmazať"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Pridať"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -511,7 +484,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Odkaz pre obnovenie hesla obdržíte e-mailom."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Meno používateľa"
 
@@ -555,7 +528,7 @@ msgstr "Osobné"
 msgid "Users"
 msgstr "Používatelia"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Aplikácie"
 
@@ -567,6 +540,34 @@ msgstr "Administrátor"
 msgid "Help"
 msgstr "Pomoc"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Prístup odmietnutý"
@@ -596,14 +597,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Upraviť kategórie"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Pridať"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -693,12 +686,12 @@ msgstr "Dokončiť inštaláciu"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s je dostupná. Získajte viac informácií k postupu aktualizáce."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Odhlásiť"
 
@@ -716,19 +709,27 @@ msgstr "V nedávnej dobe ste nezmenili svoje heslo, Váš účet môže byť kom
 msgid "Please change your password to secure your account again."
 msgstr "Prosím, zmeňte svoje heslo pre opätovné zabezpečenie Vášho účtu"
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Zabudli ste heslo?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "zapamätať"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Prihlásiť sa"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Alternatívne prihlasovanie"
 
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index b30caa95361f6e24c9b3c56585bca860e62466d4..5fd3e0096f34c9bb1da838d44392ce7bbcecb15a 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -75,15 +75,15 @@ msgstr "Zápis na disk sa nepodaril"
 msgid "Not enough storage available"
 msgstr "Nedostatok dostupného úložného priestoru"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Neplatný priečinok."
 
@@ -91,36 +91,36 @@ msgstr "Neplatný priečinok."
 msgid "Files"
 msgstr "Súbory"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Nie je k dispozícii dostatok miesta"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Odosielanie zrušené."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Opustenie stránky zruší práve prebiehajúce odosielanie súboru."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL nemôže byť prázdne."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Neplatný názov priečinka. Názov \"Shared\" je rezervovaný pre ownCloud"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Chyba"
 
@@ -132,7 +132,7 @@ msgstr "Zdieľať"
 msgid "Delete permanently"
 msgstr "Zmazať  trvalo"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Premenovať"
 
@@ -164,14 +164,14 @@ msgstr "prepísaný {new_name} súborom {old_name}"
 msgid "undo"
 msgstr "vrátiť"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n priečinok"
 msgstr[1] "%n priečinky"
 msgstr[2] "%n priečinkov"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n súbor"
@@ -230,25 +230,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Šifrovanie bolo zakázané, ale vaše súbory sú stále zašifrované. Prosím, choďte do osobného nastavenia pre dešifrovanie súborov."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Vaše sťahovanie sa pripravuje. Ak sú sťahované súbory veľké, môže to chvíľu trvať."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Názov"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Veľkosť"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Upravené"
 
@@ -257,7 +257,7 @@ msgstr "Upravené"
 msgid "%s could not be renamed"
 msgstr "%s nemohol byť premenovaný"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Odoslať"
 
@@ -293,65 +293,65 @@ msgstr "Najväčšia veľkosť ZIP súborov"
 msgid "Save"
 msgstr "Uložiť"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nová"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Textový súbor"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Priečinok"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Z odkazu"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Zmazané súbory"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Zrušiť odosielanie"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Nemáte oprávnenie na zápis."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Žiadny súbor. Nahrajte niečo!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Sťahovanie"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Zrušiť zdieľanie"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Zmazať"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Nahrávanie je príliš veľké"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Čakajte, súbory sú prehľadávané."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Práve prezerané"
 
diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po
index e0728ac23ffad4f85d174b2214d1795aea44e472..93852aaf602e6b4f7e8afc3ff6f2cc8200b0696f 100644
--- a/l10n/sk_SK/files_encryption.po
+++ b/l10n/sk_SK/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -55,14 +55,14 @@ msgid ""
 "correct."
 msgstr "Nemožno aktualizovať heslo súkromného kľúča. Možno nebolo staré heslo správne."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -70,6 +70,18 @@ msgid ""
 "files."
 msgstr "Váš privátny kľúč je nesprávny! Pravdepodobne bolo zmenené vaše heslo mimo systému ownCloud (napr. váš korporátny adresár). Môžte aktualizovať vaše heslo privátneho kľúča v osobných nastaveniach za účelom obnovenia prístupu k zašifrovaným súborom."
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "Chýbajúce požiadavky."
@@ -81,7 +93,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Prosím uistite sa, že PHP verzie 5.3.3 alebo novšej je nainštalované a tiež, že OpenSSL knižnica spolu z PHP rozšírením je povolená a konfigurovaná správne. Nateraz bola aplikácia šifrovania zablokovaná."
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "Nasledujúci používatelia nie sú nastavení pre šifrovanie:"
 
@@ -97,91 +109,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "osobné nastavenia"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Šifrovanie"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Povoliť obnovovací kľúč (umožňuje obnoviť používateľské súbory v prípade straty hesla):"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "Heslo obnovovacieho kľúča"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Povolené"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Zakázané"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "Zmeniť heslo obnovovacieho kľúča:"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "Staré heslo obnovovacieho kľúča"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "Nové heslo obnovovacieho kľúča"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Zmeniť heslo"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Vaše heslo súkromného kľúča je rovnaké ako Vaše prihlasovacie heslo:"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "Nastavte si staré heslo súkromného kľúča k Vášmu súčasnému prihlasovaciemu heslu."
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Ak si nepamätáte svoje staré heslo, môžete požiadať správcu o obnovenie svojich súborov."
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Staré prihlasovacie heslo"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Súčasné prihlasovacie heslo"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "Aktualizovať heslo súkromného kľúča"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Povoliť obnovu hesla:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Povolenie Vám umožní znovu získať prístup k Vašim zašifrovaným súborom, ak stratíte heslo"
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "Nastavenie obnovy súborov aktualizované"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "Nemožno aktualizovať obnovenie súborov"
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index 8d7b07737fe0d20e97f614ab8927fb9039e1021b..d011dccc3dfdc12e5c372d58e423cf59de5cac9e 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_SK/files_sharing.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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "Heslo je chybné. Skúste to znova."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Odoslať"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "To je nepríjemné, ale tento odkaz už nie je funkčný."
@@ -54,28 +54,28 @@ msgstr "zdieľanie je zakázané"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Pre viac informácií kontaktujte osobu, ktorá vám poslala tento odkaz."
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s zdieľa s vami priečinok %s"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s zdieľa s vami súbor %s"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Sťahovanie"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Odoslať"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Zrušiť odosielanie"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Žiaden náhľad k dispozícii pre"
diff --git a/l10n/sk_SK/files_trashbin.po b/l10n/sk_SK/files_trashbin.po
index ba114deddff3d536f2400413f8f774a0ef61085d..80355c8b6d853d22ca9589bb8cabb75a2a123dff 100644
--- a/l10n/sk_SK/files_trashbin.po
+++ b/l10n/sk_SK/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -28,44 +28,10 @@ msgstr "Nemožno zmazať %s navždy"
 msgid "Couldn't restore %s"
 msgstr "Nemožno obnoviť %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "vykonať obnovu"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Chyba"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "trvalo zmazať súbor"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Zmazať  trvalo"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Názov"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Zmazané"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n priečinok"
-msgstr[1] "%n priečinky"
-msgstr[2] "%n priečinkov"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n súbor"
-msgstr[1] "%n súbory"
-msgstr[2] "%n súborov"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "obnovené"
@@ -74,11 +40,19 @@ msgstr "obnovené"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Žiadny obsah. Kôš je prázdny!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Názov"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Obnoviť"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Zmazané"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Zmazať"
 
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 490bc7b44cf391e272731df4a0bcd2491b5e3cbf..8e4e92b4dc78f3afc26922e334977bf1378d4076 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: martin\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -370,14 +370,18 @@ msgid ""
 msgstr "V predvolenom nastavení je UUID atribút detekovaný automaticky. UUID atribút je použitý na jedinečnú identifikáciu používateľov a skupín z LDAP. Naviac je na základe UUID vytvorené tiež interné použivateľské meno, ak nie je nastavené inak. Môžete predvolené nastavenie prepísať a použiť atribút ktorý si sami zvolíte. Musíte sa ale ubezpečiť, že atribút ktorý vyberiete bude uvedený pri použivateľoch, aj pri skupinách a je jedinečný. Ponechajte prázdne pre predvolené správanie. Zmena bude mať vplyv len na novo namapovaných (pridaných) používateľov a skupiny z LDAP."
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "UUID atribút:"
+msgid "UUID Attribute for Users:"
+msgstr ""
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "Mapovanie názvov LDAP používateľských mien"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -391,18 +395,18 @@ msgid ""
 "experimental stage."
 msgstr "Použivateľské mená sa používajú pre uchovávanie a priraďovanie (meta)dát. Pre správnu identifikáciu a rozpoznanie používateľov bude mať každý používateľ z LDAP interné používateľské meno. To je nevyhnutné pre namapovanie používateľských mien na používateľov v LDAP. Vytvorené používateľské meno je namapované na UUID používateľa v LDAP. Naviac je cachovaná DN pre obmedzenie interakcie s LDAP, ale nie je používaná pre identifikáciu. Ak sa DN zmení, bude to správne rozpoznané. Interné používateľské meno sa používa všade. Vyčistenie namapování vymaže zvyšky všade. Vyčistenie naviac nie je špecifické, bude mať vplyv na všetky LDAP konfigurácie! Nikdy nečistite namapovanie v produkčnom prostredí, len v testovacej alebo experimentálnej fáze."
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Zrušiť mapovanie LDAP používateľských mien"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Zrušiť mapovanie názvov LDAP skupín"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Test nastavenia"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Pomoc"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 59fcc52a003fe2467b9e0a518aadeb5a83090c4f..ef29fc98fc52c3d2e7468e32463980aa22c15395 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -58,45 +58,6 @@ msgstr ""
 msgid "... %d%% done ..."
 msgstr ""
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Vrsta kategorije ni podana."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Ali ni kategorije za dodajanje?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Kategorija že obstaja: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Vrsta predmeta ni podana."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "ID %s ni podan."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Napaka dodajanja %s med priljubljene predmete."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Za izbris ni izbrana nobena kategorija."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Napaka odstranjevanja %s iz priljubljenih predmetov."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -323,27 +284,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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 "Vrsta predmeta ni podana."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Napaka"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Ime programa ni podano."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Zahtevana datoteka {file} ni nameščena!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "V souporabi"
@@ -352,7 +292,12 @@ msgstr "V souporabi"
 msgid "Share"
 msgstr "Souporaba"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Napaka"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Napaka med souporabo"
 
@@ -384,7 +329,7 @@ msgstr "Omogoči souporabo preko povezave"
 msgid "Password protect"
 msgstr "Zaščiti z geslom"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Geslo"
 
@@ -456,30 +401,58 @@ msgstr "izbriši"
 msgid "share"
 msgstr "določi souporabo"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Zaščiteno z geslom"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Napaka brisanja datuma preteka"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Napaka med nastavljanjem datuma preteka"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Pošiljanje ..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Elektronska pošta je poslana"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Opozorilo"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Vrsta predmeta ni podana."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Izbriši"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Dodaj"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -516,7 +489,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Uporabniško ime"
 
@@ -560,7 +533,7 @@ msgstr "Osebno"
 msgid "Users"
 msgstr "Uporabniki"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Programi"
 
@@ -572,6 +545,34 @@ msgstr "Skrbništvo"
 msgid "Help"
 msgstr "Pomoč"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Dostop je prepovedan"
@@ -601,14 +602,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Uredi kategorije"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Dodaj"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -698,12 +691,12 @@ msgstr "Končaj namestitev"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s je na voljo. Pridobite več podrobnosti za posodobitev."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Odjava"
 
@@ -721,19 +714,27 @@ msgstr "V primeru, da gesla za dostop že nekaj časa niste spremenili, je raču
 msgid "Please change your password to secure your account again."
 msgstr "Spremenite geslo za izboljšanje zaščite računa."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Ali ste pozabili geslo?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "zapomni si"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Prijava"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Druge prijavne možnosti"
 
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 388b2dedf323328812814f63ae0db25ecab56961..058b2ec0ebd8abc6dd6a1b0ad793414c5d9ec6cf 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -75,15 +75,15 @@ msgstr "Pisanje na disk je spodletelo"
 msgid "Not enough storage available"
 msgstr "Na voljo ni dovolj prostora"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Neveljavna mapa."
 
@@ -91,36 +91,36 @@ msgstr "Neveljavna mapa."
 msgid "Files"
 msgstr "Datoteke"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Na voljo ni dovolj prostora."
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Pošiljanje je preklicano."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "Naslov URL ne sme biti prazna vrednost."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Ime mape je neveljavno. Uporaba oznake \"Souporaba\" je rezervirana za ownCloud"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Napaka"
 
@@ -132,7 +132,7 @@ msgstr "Souporaba"
 msgid "Delete permanently"
 msgstr "Izbriši dokončno"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Preimenuj"
 
@@ -164,7 +164,7 @@ msgstr "preimenovano ime {new_name} z imenom {old_name}"
 msgid "undo"
 msgstr "razveljavi"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
@@ -172,7 +172,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -233,25 +233,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Postopek priprave datoteke za prejem je lahko dolgotrajen, če je datoteka zelo velika."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Spremenjeno"
 
@@ -260,7 +260,7 @@ msgstr "Spremenjeno"
 msgid "%s could not be renamed"
 msgstr "%s ni bilo mogoče preimenovati"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Pošlji"
 
@@ -296,65 +296,65 @@ msgstr "Največja vhodna velikost za datoteke ZIP"
 msgid "Save"
 msgstr "Shrani"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Novo"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Besedilna datoteka"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Mapa"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Iz povezave"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Izbrisane datoteke"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Prekliči pošiljanje"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Za to mesto ni ustreznih dovoljenj za pisanje."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Tukaj še ni ničesar. Najprej je treba kakšno datoteko poslati v oblak!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Prejmi"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Prekliči souporabo"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Izbriši"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Prekoračenje omejitve velikosti"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Poteka preučevanje datotek, počakajte ..."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Trenutno poteka preučevanje"
 
diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po
index bd85156b74968a4ed1d4e9d49acd7d619913e8f3..f3822940a5834d1f5459aa741b4e8a8f09a1e2a8 100644
--- a/l10n/sl/files_encryption.po
+++ b/l10n/sl/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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,14 +54,14 @@ msgid ""
 "correct."
 msgstr "Zasebnega ključa za geslo ni bilo mogoče posodobiti. Morda vnos starega gesla ni bil pravilen."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -69,6 +69,18 @@ msgid ""
 "files."
 msgstr "Vaš zasebni ključ ni veljaven. Morda je bilo vaše geslo spremenjeno zunaj sistema ownCloud (npr. v skupnem imeniku). Svoj zasebni ključ, ki vam bo omogočil dostop do šifriranih dokumentov, lahko posodobite v osebnih nastavitvah."
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr "Manjkajoče zahteve"
@@ -80,7 +92,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Preverite, da imate na strežniku nameščen paket PHP 5.3.3 ali novejši in da je omogočen in pravilno nastavljen PHP OpenSSL . Zaenkrat je šifriranje onemogočeno."
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "Naslednji uporabniki še nimajo nastavljenega šifriranja:"
 
@@ -96,91 +108,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "osebne nastavitve"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Šifriranje"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Omogoči ključ za obnovitev datotek (v primeru izgube gesla)"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "Ključ za obnovitev gesla"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Omogočeno"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Onemogočeno"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "Spremeni ključ za obnovitev gesla:"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "Stari ključ za obnovitev gesla"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "Nov ključ za obnovitev gesla"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Spremeni geslo"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Vaš zasebni ključ za geslo se ne ujema z vnešenim geslom ob prijavi:"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "Nastavite svoj star zasebni ključ v geslo, vnešeno ob prijavi."
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Če ste svoje geslo pozabili, lahko vaše datoteke obnovi skrbnik sistema."
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Staro geslo"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Trenutno geslo"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "Posodobi zasebni ključ"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Omogoči obnovitev gesla:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Nastavitev te možnosti omogoča ponovno pridobitev dostopa do šifriranih datotek, v primeru da boste geslo pozabili."
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "Nastavitve obnavljanja dokumentov so bile posodobljene"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "Nastavitev za obnavljanje dokumentov ni bilo mogoče posodobiti"
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index b038230f56a4e1e552e3d1ef8d237fc80838acab..1aa6dfa7fcdf3e2cccf3d7ad560a05b1e5c3a4fe 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -18,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Geslo"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Pošlji"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "Oseba %s je določila mapo %s za souporabo"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "Oseba %s je določila datoteko %s za souporabo"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Prejmi"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Pošlji"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Prekliči pošiljanje"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Predogled ni na voljo za"
diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po
index 284bba9884c497b57e3c1fdea2552c4889b2fa0f..a1311a4aa1ffa69160915d764745e7c9499eba9a 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,10 @@ msgstr "Datoteke %s ni mogoče dokončno izbrisati."
 msgid "Couldn't restore %s"
 msgstr "Ni mogoče obnoviti %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "izvedi opravilo obnavljanja"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Napaka"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "dokončno izbriši datoteko"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Izbriši dokončno"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Ime"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Izbrisano"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -75,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Mapa smeti je prazna."
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Ime"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Obnovi"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Izbrisano"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Izbriši"
 
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index 95dd8e04afc2c88f6f185cddacdc065dce579a38..bb2dbec1b032c6956f0240312697cddcee02df3a 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -369,14 +369,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "Atribut UUID"
+msgid "UUID Attribute for Users:"
+msgstr ""
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "Preslikava uporabniško ime - LDAP-uporabnik"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -390,18 +394,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Izbriši preslikavo Uporabniškega imena in LDAP-uporabnika"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Izbriši preslikavo Skupine in LDAP-skupine"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Preizkusne nastavitve"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Pomoč"
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index 14e52efa76db0aaa470b209e7922fd988d876b5f..3d83af9919286ee250c3503c86f650d01528e434 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -58,45 +58,6 @@ msgstr "Memorja e skedarëve u azhornua"
 msgid "... %d%% done ..."
 msgstr "... %d%% u krye ..."
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Mungon tipi i kategorisë."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Asnjë kategori për të shtuar?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Kjo kategori tashmë ekziston: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Mungon tipi i objektit."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "Mungon ID-ja e %s."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Veprim i gabuar gjatë shtimit të %s tek të parapëlqyerat."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Nuk selektuar për tu eliminuar asnjë kategori."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Veprim i gabuar gjatë heqjes së %s nga të parapëlqyerat."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -313,27 +274,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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 "Nuk është specifikuar tipi i objektit."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Veprim i gabuar"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Nuk është specifikuar emri i app-it."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Skedari i nevojshëm {file} nuk është i instaluar!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Ndarë"
@@ -342,7 +282,12 @@ msgstr "Ndarë"
 msgid "Share"
 msgstr "Nda"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Veprim i gabuar"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Veprim i gabuar gjatë ndarjes"
 
@@ -374,7 +319,7 @@ msgstr "Nda me lidhje"
 msgid "Password protect"
 msgstr "Mbro me kod"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Kodi"
 
@@ -446,30 +391,58 @@ msgstr "elimino"
 msgid "share"
 msgstr "nda"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Mbrojtur me kod"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Veprim i gabuar gjatë heqjes së datës së përfundimit"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Veprim i gabuar gjatë caktimit të datës së përfundimit"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Duke dërguar..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Email-i u dërgua"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Nuk është specifikuar tipi i objektit."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Elimino"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Shto"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -506,7 +479,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Përdoruesi"
 
@@ -550,7 +523,7 @@ msgstr "Personale"
 msgid "Users"
 msgstr "Përdoruesit"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "App"
 
@@ -562,6 +535,34 @@ msgstr "Admin"
 msgid "Help"
 msgstr "Ndihmë"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Ndalohet hyrja"
@@ -591,14 +592,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Ndrysho kategoritë"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Shto"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -688,12 +681,12 @@ msgstr "Mbaro setup-in"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s është i disponueshëm. Merrni më shumë informacione mbi azhurnimin."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Dalje"
 
@@ -711,19 +704,27 @@ msgstr "Nqse nuk keni ndryshuar kodin kohët e fundit, llogaria juaj mund të je
 msgid "Please change your password to secure your account again."
 msgstr "Ju lutemi, ndryshoni kodin për ta siguruar përsëri llogarinë tuaj."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Ke humbur kodin?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "kujto"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Hyrje"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Hyrje alternative"
 
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index 02ed948241cfcffc1094cdeb28610a490fe58021..ca0c9dde5e1514f165c3bc1e6b61954d2bfe2e14 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -75,15 +75,15 @@ msgstr "Ruajtja në disk dështoi"
 msgid "Not enough storage available"
 msgstr "Nuk ka mbetur hapësirë memorizimi e mjaftueshme"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Dosje e pavlefshme."
 
@@ -91,36 +91,36 @@ msgstr "Dosje e pavlefshme."
 msgid "Files"
 msgstr "Skedarët"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Nuk ka hapësirë memorizimi e mjaftueshme"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Ngarkimi u anulua."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Ngarkimi i skedarit është në vazhdim. Nqse ndërroni faqen tani ngarkimi do të anulohet."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL-i nuk mund të jetë bosh."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Emri i dosjes është i pavlefshëm. Përdorimi i \"Shared\" është i rezervuar nga Owncloud-i"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Veprim i gabuar"
 
@@ -132,7 +132,7 @@ msgstr "Nda"
 msgid "Delete permanently"
 msgstr "Elimino përfundimisht"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Riemërto"
 
@@ -164,13 +164,13 @@ msgstr "U zëvëndësua {new_name} me {old_name}"
 msgid "undo"
 msgstr "anulo"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n dosje"
 msgstr[1] "%n dosje"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n skedar"
@@ -227,25 +227,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Kodifikimi u çaktivizua por skedarët tuaj vazhdojnë të jenë të kodifikuar. Ju lutem shkoni tek parametrat personale për të dekodifikuar skedarët tuaj."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Shkarkimi juaj po përgatitet. Mund të duhet pak kohë nqse skedarët janë të mëdhenj."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Emri"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Dimensioni"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Modifikuar"
 
@@ -254,7 +254,7 @@ msgstr "Modifikuar"
 msgid "%s could not be renamed"
 msgstr "Nuk është i mundur riemërtimi i %s"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Ngarko"
 
@@ -290,65 +290,65 @@ msgstr "Dimensioni maksimal i ngarkimit të skedarëve ZIP"
 msgid "Save"
 msgstr "Ruaj"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "I ri"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Skedar teksti"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Dosje"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Nga lidhja"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Skedarë të eliminuar"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Anulo ngarkimin"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Nuk keni të drejta për të shkruar këtu."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Këtu nuk ka asgjë. Ngarkoni diçka!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Shkarko"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Hiq ndarjen"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Elimino"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Ngarkimi është shumë i madh"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Skedarët që doni të ngarkoni tejkalojnë dimensionet maksimale për ngarkimet në këtë server."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Skedarët po analizohen, ju lutemi pritni."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Analizimi aktual"
 
diff --git a/l10n/sq/files_encryption.po b/l10n/sq/files_encryption.po
index 1df9139a98ededa19d8049f927ad956cf13d8874..eb6e22d155efb8a825087712b619e7b95b70a002 100644
--- a/l10n/sq/files_encryption.po
+++ b/l10n/sq/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po
index e1a91f7789c8f1bc0de8c9364305cc85f416618a..240161ccc6eba670020d7479b85c5a6f84395bca 100644
--- a/l10n/sq/files_sharing.po
+++ b/l10n/sq/files_sharing.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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
-"Last-Translator: Odeen <rapid_odeen@zoho.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "Kodi është i gabuar. Provojeni përsëri."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Kodi"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Parashtro"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Ju kërkojmë ndjesë, kjo lidhje duket sikur nuk punon më."
@@ -54,28 +54,28 @@ msgstr "ndarja është çaktivizuar"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Për më shumë informacione, ju lutem pyesni personin që iu dërgoi këtë lidhje."
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ndau me ju dosjen %s"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ndau me ju skedarin %s"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Shkarko"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Ngarko"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Anulo ngarkimin"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Shikimi paraprak nuk është i mundur për"
diff --git a/l10n/sq/files_trashbin.po b/l10n/sq/files_trashbin.po
index ba9832da5b3c7e200775c416fea2e867d85c7fb4..1c26765b61651bb817f2dcc1e098fd2871d5947f 100644
--- a/l10n/sq/files_trashbin.po
+++ b/l10n/sq/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: Odeen <rapid_odeen@zoho.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,42 +28,10 @@ msgstr "Nuk munda ta eliminoj përfundimisht %s"
 msgid "Couldn't restore %s"
 msgstr "Nuk munda ta rivendos %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "ekzekuto operacionin e rivendosjes"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Veprim i gabuar"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "eliminoje përfundimisht skedarin"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Elimino përfundimisht"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Emri"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Eliminuar"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n dosje"
-msgstr[1] "%n dosje"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n skedar"
-msgstr[1] "%n skedarë"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "rivendosur"
@@ -72,11 +40,19 @@ msgstr "rivendosur"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Këtu nuk ka asgjë. Koshi juaj është bosh!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Emri"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Rivendos"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Eliminuar"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Elimino"
 
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index 0c630054e04b468ea6d30c0f1da0c1f3a73c088b..a93185b5252396fcb20536837b2bbf273d77cb37 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Ndihmë"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 5f083615e320f0ab76c2d66ac20d391d7497af29..322c01e097e4fe6f9b7aadaf66b0f8e011f822d2 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00: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"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 "%s ИД нису унети."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Грешка приликом додавања %s у омиљене."
-
-#: 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 "Грешка приликом уклањања %s из омиљених"
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -316,27 +277,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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 "Потребна датотека {file} није инсталирана."
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -345,7 +285,12 @@ msgstr ""
 msgid "Share"
 msgstr "Дели"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Грешка"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Грешка у дељењу"
 
@@ -377,7 +322,7 @@ msgstr "Подели линк"
 msgid "Password protect"
 msgstr "Заштићено лозинком"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Лозинка"
 
@@ -449,30 +394,58 @@ msgstr "обриши"
 msgid "share"
 msgstr "подели"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Заштићено лозинком"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Грешка код поништавања датума истека"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Грешка код постављања датума истека"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Шаљем..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Порука је послата"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Упозорење"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Врста објекта није подешена."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Обриши"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Додај"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -509,7 +482,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Добићете везу за ресетовање лозинке путем е-поште."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Корисничко име"
 
@@ -553,7 +526,7 @@ msgstr "Лично"
 msgid "Users"
 msgstr "Корисници"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Апликације"
 
@@ -565,6 +538,34 @@ msgstr "Администратор"
 msgid "Help"
 msgstr "Помоћ"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Забрањен приступ"
@@ -594,14 +595,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Измени категорије"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Додај"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -691,12 +684,12 @@ msgstr "Заврши подешавање"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Одјава"
 
@@ -714,19 +707,27 @@ msgstr "Ако ускоро не промените лозинку ваш нал
 msgid "Please change your password to secure your account again."
 msgstr "Промените лозинку да бисте обезбедили налог."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Изгубили сте лозинку?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "упамти"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Пријава"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index a3df05d5cdf2557561c6811f88f27ae48b9cc74a..3bd592d1f103d14d961f521a718793d04cb8b7e7 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -74,15 +74,15 @@ msgstr "Не могу да пишем на диск"
 msgid "Not enough storage available"
 msgstr "Нема довољно простора"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "неисправна фасцикла."
 
@@ -90,36 +90,36 @@ msgstr "неисправна фасцикла."
 msgid "Files"
 msgstr "Датотеке"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Нема довољно простора"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Отпремање је прекинуто."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "Адреса не може бити празна."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Грешка"
 
@@ -131,7 +131,7 @@ msgstr "Дели"
 msgid "Delete permanently"
 msgstr "Обриши за стално"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Преименуј"
 
@@ -163,14 +163,14 @@ msgstr "замењено {new_name} са {old_name}"
 msgid "undo"
 msgstr "опозови"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -229,25 +229,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Припремам преузимање. Ово може да потраје ако су датотеке велике."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Величина"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Измењено"
 
@@ -256,7 +256,7 @@ msgstr "Измењено"
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Отпреми"
 
@@ -292,65 +292,65 @@ msgstr "Највећа величина ZIP датотека"
 msgid "Save"
 msgstr "Сачувај"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Нова"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "текстуална датотека"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "фасцикла"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Са везе"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Обрисане датотеке"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Прекини отпремање"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Овде немате дозволу за писање."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Овде нема ничег. Отпремите нешто!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Преузми"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Укини дељење"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Обриши"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Датотека је превелика"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Датотеке које желите да отпремите прелазе ограничење у величини."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Скенирам датотеке…"
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Тренутно скенирање"
 
diff --git a/l10n/sr/files_encryption.po b/l10n/sr/files_encryption.po
index 1740a985aabb47e88f1973592a655d0c61360974..922f0c92d87a9382fc241a6a8d3184e6c8a1eb61 100644
--- a/l10n/sr/files_encryption.po
+++ b/l10n/sr/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Шифровање"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index db4a7eeb22e5ee6432a7b4f4f8b96b5fc3fc9fcd..6f6e7571af11080c1aa825694712b798546381c6 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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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,17 +18,17 @@ msgstr ""
 "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"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Пошаљи"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Преузми"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Отпреми"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Прекини отпремање"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/sr/files_trashbin.po b/l10n/sr/files_trashbin.po
index 3d3a324b2b57ac3f52efe398d85b57cb57a08611..323c0428f80a02d627376844f8290d03e8305e03 100644
--- a/l10n/sr/files_trashbin.po
+++ b/l10n/sr/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,10 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "врати у претходно стање"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Грешка"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Обриши за стално"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Име"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Обрисано"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -73,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Овде нема ништа. Корпа за отпатке је празна."
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Име"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Врати"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Обрисано"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Обриши"
 
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index 7949578324a1e854149eebda5787ca627c55672a..7838f709e1a162287aa9412d207cfcd637f42ebb 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Помоћ"
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 24bc1b3347e154b55909140322ed146912b05978..f1b449948ccbebe3a9f8cf4d819361f19099230c 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -57,45 +57,6 @@ msgstr ""
 msgid "... %d%% done ..."
 msgstr ""
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Tip kategorije nije zadan."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Bez dodavanja kategorije?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Kategorija već postoji: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Tip objekta nije zadan."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID nije zadan."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Greška u dodavanju %s u omiljeno."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Kategorije za brisanje nisu izabrane."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Greška u uklanjanju %s iz omiljeno."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -317,27 +278,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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 "Tip objekta nije zadan."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Greška"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Ime aplikacije nije precizirano."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Potreban fajl {file} nije instaliran!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Deljeno"
@@ -346,7 +286,12 @@ msgstr "Deljeno"
 msgid "Share"
 msgstr "Podeli"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Greška"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Greška pri deljenju"
 
@@ -378,7 +323,7 @@ msgstr "Podeli koristei link"
 msgid "Password protect"
 msgstr "Zaštita lozinkom"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Lozinka"
 
@@ -450,30 +395,58 @@ msgstr "brisanje"
 msgid "share"
 msgstr "deljenje"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Zaštćeno lozinkom"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Greška u uklanjanju datuma isteka"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Greška u postavljanju datuma isteka"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Slanje..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Email poslat"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Tip objekta nije zadan."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Obriši"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Dodaj"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -510,7 +483,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Dobićete vezu za resetovanje lozinke putem e-pošte."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Korisničko ime"
 
@@ -554,7 +527,7 @@ msgstr "Lično"
 msgid "Users"
 msgstr "Korisnici"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Programi"
 
@@ -566,6 +539,34 @@ msgstr "Adninistracija"
 msgid "Help"
 msgstr "Pomoć"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Pristup zabranjen"
@@ -595,14 +596,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Izmena kategorija"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Dodaj"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -692,12 +685,12 @@ msgstr "Završi podešavanje"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Odjava"
 
@@ -715,19 +708,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Izgubili ste lozinku?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "upamti"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index 4c630d0622315cf7822265f2dcc4677a0c87a4fe..4a0d0d98011cc549f707e800798e24753469ee93 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -74,15 +74,15 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr ""
 
@@ -90,36 +90,36 @@ msgstr ""
 msgid "Files"
 msgstr "Fajlovi"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr ""
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Greška"
 
@@ -131,7 +131,7 @@ msgstr "Podeli"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr ""
 
@@ -163,14 +163,14 @@ msgstr ""
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -229,25 +229,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Zadnja izmena"
 
@@ -256,7 +256,7 @@ msgstr "Zadnja izmena"
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Pošalji"
 
@@ -292,65 +292,65 @@ msgstr ""
 msgid "Save"
 msgstr "Snimi"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Ovde nema ničeg. Pošaljite nešto!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Ukljoni deljenje"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Pošiljka je prevelika"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/sr@latin/files_encryption.po b/l10n/sr@latin/files_encryption.po
index 591d38389ca596c7dac41307da8741e8609c2312..45326215dcc955323701e533b041e69c0bafa7b0 100644
--- a/l10n/sr@latin/files_encryption.po
+++ b/l10n/sr@latin/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index 875bfffa7f314a54aa1b0cb3e1ffc92cd0247559..21aa02106f144e3d1846796033f2c883dfcff53d 100644
--- a/l10n/sr@latin/files_sharing.po
+++ b/l10n/sr@latin/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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,17 +18,17 @@ msgstr ""
 "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"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Pošalji"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Pošalji"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/sr@latin/files_trashbin.po b/l10n/sr@latin/files_trashbin.po
index f4cf46e9bcb0a394fbc9e79b23fc9cb32dce9c48..f416012ff60a3fd50fb9e3f32048d118ef412b39 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,10 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Greška"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr ""
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Ime"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -73,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Ime"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Obriši"
 
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index 4280b445590a0a323724c380f2df64fb74423ca6..6627168bd4f1f34b6bbb266d21ba7ca541959f96 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Pomoć"
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index adcde6fe3b4b8b4294a94fc18ca2447eecdfad2a..d488dc179a885afe1956627ffb68178edc913696 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -30,7 +30,7 @@ msgstr "%s delade »%s« med dig"
 #: ajax/share.php:168
 #, php-format
 msgid "Couldn't send mail to following users: %s "
-msgstr ""
+msgstr "Gick inte att skicka e-post till följande användare: %s"
 
 #: ajax/share.php:327
 msgid "group"
@@ -61,45 +61,6 @@ msgstr "Uppdaterade filcache"
 msgid "... %d%% done ..."
 msgstr "... %d%% klart ..."
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Kategorityp inte angiven."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Ingen kategori att lägga till?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Denna kategori finns redan: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Objekttyp inte angiven."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID inte angiven."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Fel vid tillägg av %s till favoriter."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Inga kategorier valda för radering."
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Fel vid borttagning av %s från favoriter."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Ingen bild eller fil har tillhandahållits"
@@ -316,27 +277,6 @@ msgstr "({count} valda)"
 msgid "Error loading file exists template"
 msgstr "Fel uppstod filmall existerar"
 
-#: 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 "Objekttypen är inte specificerad."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Fel"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr " Namnet på appen är inte specificerad."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Den nödvändiga filen {file} är inte installerad!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Delad"
@@ -345,7 +285,12 @@ msgstr "Delad"
 msgid "Share"
 msgstr "Dela"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Fel"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Fel vid delning"
 
@@ -377,7 +322,7 @@ msgstr "Delad med länk"
 msgid "Password protect"
 msgstr "Lösenordsskydda"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Lösenord"
 
@@ -423,7 +368,7 @@ msgstr "Sluta dela"
 
 #: js/share.js:353
 msgid "notify user by email"
-msgstr ""
+msgstr "notifiera användare via e-post"
 
 #: js/share.js:361
 msgid "can edit"
@@ -449,30 +394,58 @@ msgstr "radera"
 msgid "share"
 msgstr "dela"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Lösenordsskyddad"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Fel vid borttagning av utgångsdatum"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Fel vid sättning av utgångsdatum"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Skickar ..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "E-post skickat"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Varning"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Objekttypen är inte specificerad."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Radera"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Lägg till"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -509,7 +482,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Du får en länk att återställa ditt lösenord via e-post."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Användarnamn"
 
@@ -553,7 +526,7 @@ msgstr "Personligt"
 msgid "Users"
 msgstr "Användare"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Program"
 
@@ -565,6 +538,34 @@ msgstr "Admin"
 msgid "Help"
 msgstr "Hjälp"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Åtkomst förbjuden"
@@ -581,26 +582,18 @@ msgid ""
 "just letting you know that %s shared %s with you.\n"
 "View it: %s\n"
 "\n"
-msgstr ""
+msgstr "Hej där,⏎\n⏎\nville bara meddela dig att %s delade %s med dig.⏎\nTitta på den: %s⏎\n⏎\n"
 
 #: templates/altmail.php:4
 #, php-format
 msgid ""
 "The share will expire on %s.\n"
 "\n"
-msgstr ""
+msgstr "Utdelningen kommer att upphöra %s.⏎\n⏎\n"
 
 #: templates/altmail.php:6 templates/mail.php:19
 msgid "Cheers!"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Editera kategorier"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Lägg till"
+msgstr "Vi höres!"
 
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
@@ -689,14 +682,14 @@ msgstr "Avsluta installation"
 
 #: templates/installation.php:184
 msgid "Finishing …"
-msgstr ""
+msgstr "Avslutar ..."
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s är tillgänglig. Få mer information om hur du går tillväga för att uppdatera."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Logga ut"
 
@@ -714,19 +707,27 @@ msgstr "Om du inte har ändrat ditt lösenord nyligen så kan ditt konto vara ma
 msgid "Please change your password to secure your account again."
 msgstr "Ändra genast lösenord för att säkra ditt konto."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr "Servern misslyckades med autentisering!"
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr "Kontakta din administratör."
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Glömt ditt lösenord?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "kom ihåg"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Logga in"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Alternativa inloggningar"
 
@@ -735,12 +736,12 @@ msgstr "Alternativa inloggningar"
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>"
-msgstr ""
+msgstr "Hej där,<br><br>ville bara informera dig om att %s delade »%s« med dig.<br><a href=\"%s\">Titta på den!</a><br><br>"
 
 #: templates/mail.php:17
 #, php-format
 msgid "The share will expire on %s.<br><br>"
-msgstr ""
+msgstr "Utdelningen kommer att upphöra %s.<br><br>"
 
 #: templates/update.php:3
 #, php-format
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 39cd256c8680810faeb1944eb527fb50f8aaa05a..57c38cbf1bf5a351beaef494c42529e03e1cae5e 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daniel Sandman <revoltism@gmail.com>, 2013
 # Gunnar Norin <blittan@xbmc.org>, 2013
 # medialabs, 2013
 # Magnus Höglund <magnus@linux.com>, 2013
@@ -11,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 21:10+0000\n"
+"Last-Translator: Daniel Sandman <revoltism@gmail.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"
@@ -78,15 +79,15 @@ msgstr "Misslyckades spara till disk"
 msgid "Not enough storage available"
 msgstr "Inte tillräckligt med lagringsutrymme tillgängligt"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
-msgstr ""
+msgstr "Uppladdning misslyckades. Gick inte att hämta filinformation."
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
-msgstr ""
+msgstr "Uppladdning misslyckades. Kunde inte hitta den uppladdade filen"
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Felaktig mapp."
 
@@ -94,36 +95,36 @@ msgstr "Felaktig mapp."
 msgid "Files"
 msgstr "Filer"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Kan inte ladda upp {filename} eftersom den antingen är en mapp eller har 0 bytes."
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Inte tillräckligt med utrymme tillgängligt"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Uppladdning avbruten."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
-msgstr ""
+msgstr "Gick inte att hämta resultat från server."
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL kan inte vara tom."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Ogiltigt mappnamn. Användning av 'Shared' är reserverad av ownCloud"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Fel"
 
@@ -135,7 +136,7 @@ msgstr "Dela"
 msgid "Delete permanently"
 msgstr "Radera permanent"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Byt namn"
 
@@ -167,13 +168,13 @@ msgstr "ersatt {new_name} med {old_name}"
 msgid "undo"
 msgstr "ångra"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mapp"
 msgstr[1] "%n mappar"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fil"
@@ -215,14 +216,14 @@ msgstr "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)"
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
-msgstr ""
+msgstr "Krypteringsprogrammet är aktiverat men dina nycklar är inte initierade. Vänligen logga ut och  in igen"
 
 #: js/files.js:72
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
-msgstr ""
+msgstr "Ogiltig privat nyckel i krypteringsprogrammet. Vänligen uppdatera lösenordet till din privata nyckel under dina personliga inställningar för att återfå tillgång till dina krypterade filer."
 
 #: js/files.js:76
 msgid ""
@@ -230,25 +231,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Kryptering inaktiverades men dina filer är fortfarande krypterade. Vänligen gå till sidan för dina personliga inställningar för att dekryptera dina filer."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Din nedladdning förbereds. Det kan ta tid om det är stora filer."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
-msgstr ""
+msgstr "Fel uppstod vid flyttning av fil"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Storlek"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Ändrad"
 
@@ -257,7 +258,7 @@ msgstr "Ändrad"
 msgid "%s could not be renamed"
 msgstr "%s kunde inte namnändras"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Ladda upp"
 
@@ -293,65 +294,65 @@ msgstr "Största tillåtna storlek för ZIP-filer"
 msgid "Save"
 msgstr "Spara"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Ny"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Textfil"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Mapp"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Från länk"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Raderade filer"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Avbryt uppladdning"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Du saknar skrivbehörighet här."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting här. Ladda upp något!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Ladda ner"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Sluta dela"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Radera"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "För stor uppladdning"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Filer skannas, var god vänta"
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Aktuell skanning"
 
diff --git a/l10n/sv/files_encryption.po b/l10n/sv/files_encryption.po
index cda8bdec222f172f976fdcca61c785640f301e26..b1e9501ba6a10328828ffae32dd7a1166d088dbe 100644
--- a/l10n/sv/files_encryption.po
+++ b/l10n/sv/files_encryption.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daniel Sandman <revoltism@gmail.com>, 2013
 # medialabs, 2013
 # Magnus Höglund <magnus@linux.com>, 2013
 # medialabs, 2013
@@ -11,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -49,28 +50,40 @@ msgstr "Kunde inte ändra lösenordet. Kanske det gamla lösenordet inte var rä
 
 #: ajax/updatePrivateKeyPassword.php:52
 msgid "Private key password successfully updated."
-msgstr "Den privata lösenordsnyckeln uppdaterades utan problem."
+msgstr "Den privata nyckelns lösenord uppdaterades utan problem."
 
 #: ajax/updatePrivateKeyPassword.php:54
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr "Kunde inte uppdatera den privata lösenordsnyckeln. Kanske var det gamla lösenordet fel."
+msgstr "Kunde inte uppdatera lösenordet för den privata nyckeln. Kanske var det gamla lösenordet fel."
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
-msgstr ""
+msgstr "Krypteringsprogrammet kunde inte initieras! Möjligen blev krypteringsprogrammet återaktiverad under din session. Försök med att logga ut och in igen för att initiera krypteringsprogrammet."
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
 " key password in your personal settings to recover access to your encrypted "
 "files."
-msgstr "Din privata lösenordsnyckel är inte giltig! Troligen har ditt lösenord ändrats utanför ownCloud (t.ex. i företagets katalogtjänst). Du kan uppdatera den privata lösenordsnyckeln under dina personliga inställningar för att återfå tillgång till dina filer."
+msgstr "Lösenordet för din privata nyckel är inte giltig! Troligen har ditt lösenord ändrats utanför ownCloud (t.ex. i företagets katalogtjänst). Du kan uppdatera lösenordet för den privata nyckeln under dina personliga inställningar för att återfå tillgång till dina filer."
+
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
 
 #: hooks/hooks.php:53
 msgid "Missing requirements."
@@ -83,7 +96,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Kontrollera att PHP 5.3.3 eller senare är installerad och att tillägget OpenSSL PHP är aktiverad och korrekt konfigurerad. Kryptering är tillsvidare inaktiverad."
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr "Följande användare har inte aktiverat kryptering:"
 
@@ -93,97 +106,97 @@ msgstr "Sparar..."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
-msgstr ""
+msgstr "Gå direkt till din"
 
 #: templates/invalid_private_key.php:8
 msgid "personal settings"
 msgstr "personliga inställningar"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
-msgstr "Aktivera lösenordsnyckel (för att kunna återfå användarens filer vid glömt eller förlorat lösenord):"
+msgstr "Aktivera återställningsnyckel (för att kunna återfå användarens filer vid glömt eller förlorat lösenord):"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
-msgstr "Lösenordsnyckel"
+msgstr "Lösenord för återställningsnyckel"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
-msgstr ""
+msgstr "Upprepa återställningsnyckelns lösenord"
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Inaktiverad"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
-msgstr "Ändra lösenordsnyckel:"
+msgstr "Ändra lösenord för återställningsnyckel:"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
-msgstr "Gammal lösenordsnyckel"
+msgstr "Gammalt lösenord för återställningsnyckel"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
-msgstr "Ny lösenordsnyckel"
+msgstr "Nytt lösenord för återställningsnyckel"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
-msgstr ""
+msgstr "Upprepa lösenord för ny återställningsnyckel"
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Byt lösenord"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
-msgstr "Din privata lösenordsnyckel stämmer inte längre överrens med ditt inloggningslösenord:"
+msgstr "Lösenordet till din privata nyckel stämmer inte längre överens med ditt inloggningslösenord:"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
-msgstr "Ställ in din gamla privata lösenordsnyckel till ditt aktuella inloggningslösenord."
+msgstr "Använd din gamla privata nyckels lösenord som ditt aktuella inloggningslösenord."
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Om du inte kommer ihåg ditt gamla lösenord kan du be din administratör att återställa dina filer."
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "Gammalt inloggningslösenord"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "Nuvarande inloggningslösenord"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
-msgstr "Uppdatera den privata lösenordsnyckeln"
+msgstr "Uppdatera lösenordet för din privata nyckel"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "Aktivera lösenordsåterställning"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Genom att aktivera detta alternativ kommer du kunna återfå tillgång till dina krypterade filer om du skulle förlora/glömma ditt lösenord"
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "Inställningarna för filåterställning har uppdaterats"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "Kunde inte uppdatera filåterställning"
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index 2716b5f204cca7e4d0df4b5950bb73dd476b3377..d591ac249980450cae563df908016f2bb312e14d 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -20,17 +20,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "Lösenordet är fel. Försök igen."
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Lösenord"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Skicka"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "Tyvärr, denna länk verkar inte fungera längre."
@@ -55,28 +55,28 @@ msgstr "delning är inaktiverat"
 msgid "For more info, please ask the person who sent this link."
 msgstr "För mer information, kontakta den person som skickade den här länken."
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s delade mappen %s med dig"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s delade filen %s med dig"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Ladda ner"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Ladda upp"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Avbryt uppladdning"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Ingen förhandsgranskning tillgänglig för"
diff --git a/l10n/sv/files_trashbin.po b/l10n/sv/files_trashbin.po
index 7116eb647ae412a1fea623f8be04e6e998573329..99829fc7009cfe7179fac5b98b76204f2fb5e437 100644
--- a/l10n/sv/files_trashbin.po
+++ b/l10n/sv/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: medialabs\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -29,42 +29,10 @@ msgstr "Kunde inte radera %s permanent"
 msgid "Couldn't restore %s"
 msgstr "Kunde inte återställa %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "utför återställning"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Fel"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "radera filen permanent"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Radera permanent"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Namn"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Raderad"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n mapp"
-msgstr[1] "%n mappar"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n fil"
-msgstr[1] "%n filer"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "återställd"
@@ -73,11 +41,19 @@ msgstr "återställd"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Ingenting här. Din papperskorg är tom!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Namn"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Återskapa"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Raderad"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Radera"
 
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index ba933c67ff85e86893db0c3f05be7ccef3695487..8b8e72c53a124c8abe81c3c12a0bcafdeea355df 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daniel Sandman <revoltism@gmail.com>, 2013
 # medialabs, 2013
 # Magnus Höglund <magnus@linux.com>, 2013
 # medialabs, 2013
@@ -10,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 21:20+0000\n"
+"Last-Translator: Daniel Sandman <revoltism@gmail.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"
@@ -20,53 +21,53 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:237
+#: private/app.php:243
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "Appen \"%s\" kan inte installeras eftersom att den inte är kompatibel med denna version av ownCloud."
 
-#: private/app.php:248
+#: private/app.php:254
 msgid "No app name specified"
 msgstr "Inget appnamn angivet"
 
-#: private/app.php:352
+#: private/app.php:359
 msgid "Help"
 msgstr "Hjälp"
 
-#: private/app.php:365
+#: private/app.php:372
 msgid "Personal"
 msgstr "Personligt"
 
-#: private/app.php:376
+#: private/app.php:383
 msgid "Settings"
 msgstr "Inställningar"
 
-#: private/app.php:388
+#: private/app.php:395
 msgid "Users"
 msgstr "Användare"
 
-#: private/app.php:401
+#: private/app.php:408
 msgid "Admin"
 msgstr "Admin"
 
-#: private/app.php:832
+#: private/app.php:839
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Misslyckades med att uppgradera \"%s\"."
 
 #: private/avatar.php:56
 msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
+msgstr "Anpassningsbara profilbilder fungerar inte med kryptering ännu."
 
 #: private/avatar.php:64
 msgid "Unknown filetype"
-msgstr ""
+msgstr "Okänd filtyp"
 
 #: private/avatar.php:69
 msgid "Invalid image"
-msgstr ""
+msgstr "Ogiltig bild"
 
 #: private/defaults.php:36
 msgid "web services under your control"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index a59b02df0fbc3183959a3a8c8bd85766ee655298..5ab40729a96bbde1028a744e06697b8a452ea4e2 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -371,14 +371,18 @@ msgid ""
 msgstr "Som standard upptäcker ownCloud automatiskt UUID-attributet. Det UUID-attributet används för att utan tvivel identifiera LDAP-användare och grupper. Dessutom kommer interna användarnamn skapas baserat på detta UUID, om inte annat anges ovan. Du kan åsidosätta inställningen och passera ett attribut som du själv väljer. Du måste se till att attributet som du väljer kan hämtas för både användare och grupper och att det är unikt. Lämna det tomt för standard beteende. Förändringar kommer endast att påverka nyligen mappade (tillagda) LDAP-användare och grupper."
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "UUID Attribut:"
+msgid "UUID Attribute for Users:"
+msgstr ""
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "Användarnamn-LDAP User Mapping"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -392,18 +396,18 @@ msgid ""
 "experimental stage."
 msgstr "ownCloud använder sig av användarnamn för att lagra och tilldela (meta) data. För att exakt kunna identifiera och känna igen användare, kommer varje LDAP-användare ha ett internt användarnamn. Detta kräver en mappning från ownCloud-användarnamn till LDAP-användare. Det skapade användarnamnet mappas till UUID för LDAP-användaren. Dessutom cachas DN  samt minska LDAP-interaktionen, men den används inte för identifiering. Om DN förändras, kommer förändringarna hittas av ownCloud. Det interna ownCloud-namnet används överallt i ownCloud. Om du rensar/raderar mappningarna kommer att lämna referenser överallt i systemet. Men den är inte konfigurationskänslig, den påverkar alla LDAP-konfigurationer! Rensa/radera aldrig mappningarna i en produktionsmiljö. Utan gör detta endast på i testmiljö!"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Rensa Användarnamn-LDAP User Mapping"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Rensa Gruppnamn-LDAP Group Mapping"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Testa konfigurationen"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Hjälp"
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index e3c4f8018e8546541ef4bfa7bf29af4a1e0a7341..c2d5b1b04557715bd105a1ac4bd62add31100de6 100644
--- a/l10n/sw_KE/core.po
+++ b/l10n/sw_KE/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -311,27 +272,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -340,7 +280,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr ""
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -372,7 +317,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr ""
 
@@ -444,30 +389,58 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -504,7 +477,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr ""
 
@@ -548,7 +521,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr ""
 
@@ -560,6 +533,34 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -589,14 +590,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr ""
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -686,12 +679,12 @@ msgstr ""
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr ""
 
@@ -709,19 +702,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/sw_KE/files_encryption.po b/l10n/sw_KE/files_encryption.po
index 62bebc15d4037e500451d01a7c68ff5e8c929006..14223e8516b794dfebf2af3e168f559ac88438e1 100644
--- a/l10n/sw_KE/files_encryption.po
+++ b/l10n/sw_KE/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/sw_KE/files_sharing.po b/l10n/sw_KE/files_sharing.po
index 0cf4663cb99b2cd07f51c2c15f72fad0dfbd94a6..ce2e4e932a6d2ca0c503fa90ede820a245a7d2d2 100644
--- a/l10n/sw_KE/files_sharing.po
+++ b/l10n/sw_KE/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-07-31 01:55-0400\n"
-"PO-Revision-Date: 2013-07-31 05:56+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
-msgid "Password"
+msgid "The password is wrong. Try again."
 msgstr ""
 
-#: templates/authenticate.php:9
-msgid "Submit"
+#: templates/authenticate.php:10
+msgid "Password"
 msgstr ""
 
 #: templates/part.404.php:3
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:85
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/sw_KE/files_trashbin.po b/l10n/sw_KE/files_trashbin.po
index 3edc43234c3a18b342939e88c5cb7d3ac3b45f1c..c05cce48dea494732f1d29a4360c59001e43be72 100644
--- a/l10n/sw_KE/files_trashbin.po
+++ b/l10n/sw_KE/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-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -27,55 +27,31 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:100
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:36
-msgid "delete file permanently"
+#: lib/trashbin.php:814 lib/trashbin.php:816
+msgid "restored"
 msgstr ""
 
-#: js/trash.js:127
-msgid "Delete permanently"
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: js/trash.js:182 templates/index.php:17
+#: templates/index.php:23
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:183 templates/index.php:27
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:191
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:197
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/trash.php:819 lib/trash.php:821
-msgid "restored"
-msgstr ""
-
-#: templates/index.php:9
-msgid "Nothing in here. Your trash bin is empty!"
+#: templates/index.php:26 templates/index.php:28
+msgid "Restore"
 msgstr ""
 
-#: templates/index.php:20 templates/index.php:22
-msgid "Restore"
+#: templates/index.php:34
+msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:30 templates/index.php:31
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr ""
 
diff --git a/l10n/sw_KE/user_ldap.po b/l10n/sw_KE/user_ldap.po
index e51b2fcb6f1dbeafe1c362479aa9ae1dc60205e2..73c0557efa98c623b28411404df244fca5a90686 100644
--- a/l10n/sw_KE/user_ldap.po
+++ b/l10n/sw_KE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:36
+#: ajax/testConfiguration.php:37
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:39
+#: ajax/testConfiguration.php:40
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:43
+#: ajax/testConfiguration.php:44
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr ""
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index 69d4c7beb2f24dd4d5a5831b70da1b8148d30e53..fb4e3d72088c0a5f144307ef27e85466c0986d53 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 "%s ID வழங்கப்படவில்லை"
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "விருப்பங்களுக்கு %s ஐ சேர்ப்பதில் வழு"
-
-#: 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 "விருப்பத்திலிருந்து %s ஐ அகற்றுவதில் வழு.உஇஇ"
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -311,27 +272,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -340,7 +280,12 @@ msgstr ""
 msgid "Share"
 msgstr "பகிர்வு"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "வழு"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "பகிரும் போதான வழு"
 
@@ -372,7 +317,7 @@ msgstr "இணைப்புடன் பகிர்தல்"
 msgid "Password protect"
 msgstr "கடவுச்சொல்லை பாதுகாத்தல்"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
@@ -444,30 +389,58 @@ msgstr "நீக்குக"
 msgid "share"
 msgstr "பகிர்தல்"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "கடவுச்சொல் பாதுகாக்கப்பட்டது"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "எச்சரிக்கை"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "பொருள் வகை குறிப்பிடப்படவில்லை."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "நீக்குக"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "சேர்க்க"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -504,7 +477,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். "
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "பயனாளர் பெயர்"
 
@@ -548,7 +521,7 @@ msgstr "தனிப்பட்ட"
 msgid "Users"
 msgstr "பயனாளர்"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "செயலிகள்"
 
@@ -560,6 +533,34 @@ msgstr "நிர்வாகம்"
 msgid "Help"
 msgstr "உதவி"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "அணுக தடை"
@@ -589,14 +590,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "வகைகளை தொகுக்க"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "சேர்க்க"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -686,12 +679,12 @@ msgstr "அமைப்பை முடிக்க"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "விடுபதிகை செய்க"
 
@@ -709,19 +702,27 @@ msgstr "உங்களுடைய கடவுச்சொல்லை அண
 msgid "Please change your password to secure your account again."
 msgstr "உங்களுடைய கணக்கை மீண்டும் பாதுகாக்க தயவுசெய்து உங்களுடைய கடவுச்சொல்லை மாற்றவும்."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "உங்கள் கடவுச்சொல்லை தொலைத்துவிட்டீர்களா?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "ஞாபகப்படுத்துக"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "புகுபதிகை"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index 963a52c9a7d1afe7402c43864dab1bc43707f400..19a1a5bea2b291e3c002cbd9087bebe9daa233f0 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -74,15 +74,15 @@ msgstr "வட்டில் எழுத முடியவில்லை"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr ""
 
@@ -90,36 +90,36 @@ msgstr ""
 msgid "Files"
 msgstr "கோப்புகள்"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr ""
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது"
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL  வெறுமையாக இருக்கமுடியாது."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "வழு"
 
@@ -131,7 +131,7 @@ msgstr "பகிர்வு"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "பெயர்மாற்றம்"
 
@@ -163,13 +163,13 @@ msgstr "{new_name} ஆனது {old_name} இனால் மாற்றப்
 msgid "undo"
 msgstr "முன் செயல் நீக்கம் "
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -226,25 +226,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "பெயர்"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "அளவு"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "மாற்றப்பட்டது"
 
@@ -253,7 +253,7 @@ msgstr "மாற்றப்பட்டது"
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "பதிவேற்றுக"
 
@@ -289,65 +289,65 @@ msgstr "ZIP கோப்புகளுக்கான ஆகக்கூடி
 msgid "Save"
 msgstr "சேமிக்க "
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "புதிய"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "கோப்பு உரை"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "கோப்புறை"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "இணைப்பிலிருந்து"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "பதிவேற்றலை இரத்து செய்க"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "இங்கு ஒன்றும் இல்லை. ஏதாவது பதிவேற்றுக!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "பதிவிறக்குக"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "பகிரப்படாதது"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "நீக்குக"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "பதிவேற்றல் மிகப்பெரியது"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "கோப்புகள் வருடப்படுகின்றன, தயவுசெய்து காத்திருங்கள்."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "தற்போது வருடப்படுபவை"
 
diff --git a/l10n/ta_LK/files_encryption.po b/l10n/ta_LK/files_encryption.po
index 5bdd47956cc776e93965307e0a2cab042f79e78f..b94acf8c75ad19161755848acabb45bc6d20de6a 100644
--- a/l10n/ta_LK/files_encryption.po
+++ b/l10n/ta_LK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "மறைக்குறியீடு"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po
index 73a4ffdeae2216a3af721432b985fbdf192806bc..b832787803acf2b29e052c5869aa4e3283851da3 100644
--- a/l10n/ta_LK/files_sharing.po
+++ b/l10n/ta_LK/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "சமர்ப்பிக்குக"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s கோப்புறையானது %s உடன் பகிரப்பட்டது"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s கோப்பானது %s உடன் பகிரப்பட்டது"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "பதிவிறக்குக"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "பதிவேற்றுக"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "பதிவேற்றலை இரத்து செய்க"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "அதற்கு முன்னோக்கு ஒன்றும் இல்லை"
diff --git a/l10n/ta_LK/files_trashbin.po b/l10n/ta_LK/files_trashbin.po
index 937d88eaa1b4e48bddee6bbe655fa3d81e7f883e..36891b910618b8cff816c2659b55c475948bd6fe 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,42 +27,10 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "வழு"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr ""
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "பெயர்"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -71,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "பெயர்"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "நீக்குக"
 
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index 3b2312317a281df9eeffd549be3c83b1fe91ef7c..4fa01f7f62081a1fff4b5c2ae7112940a35348de 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "உதவி"
diff --git a/l10n/te/core.po b/l10n/te/core.po
index f44b287c483399b93d020ecd6287ce468b2bcfed..8c38f93b9461f3d4574c290d45bcc5a0e882af5f 100644
--- a/l10n/te/core.po
+++ b/l10n/te/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 "ఈ వర్గం ఇప్పటికే ఉంది: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr ""
-
-#: 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -311,27 +272,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -340,7 +280,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "పొరపాటు"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -372,7 +317,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "సంకేతపదం"
 
@@ -444,30 +389,58 @@ msgstr "తొలగించు"
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "తొలగించు"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "చేర్చు"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -504,7 +477,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "వాడుకరి పేరు"
 
@@ -548,7 +521,7 @@ msgstr ""
 msgid "Users"
 msgstr "వాడుకరులు"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr ""
 
@@ -560,6 +533,34 @@ msgstr ""
 msgid "Help"
 msgstr "సహాయం"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -589,14 +590,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "చేర్చు"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -686,12 +679,12 @@ msgstr ""
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "నిష్క్రమించు"
 
@@ -709,19 +702,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "మీ సంకేతపదం పోయిందా?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/te/files.po b/l10n/te/files.po
index 882a13053f15c8f4c74080568133110145b942c1..5ec3896b375c462816345990b87bd1f282048c34 100644
--- a/l10n/te/files.po
+++ b/l10n/te/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -74,15 +74,15 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr ""
 
@@ -90,36 +90,36 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr ""
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "పొరపాటు"
 
@@ -131,7 +131,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr "శాశ్వతంగా తొలగించు"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr ""
 
@@ -163,13 +163,13 @@ msgstr ""
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -226,25 +226,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "పేరు"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "పరిమాణం"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr ""
 
@@ -253,7 +253,7 @@ msgstr ""
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr ""
 
@@ -289,65 +289,65 @@ msgstr ""
 msgid "Save"
 msgstr "భద్రపరచు"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "సంచయం"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "తొలగించు"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/te/files_encryption.po b/l10n/te/files_encryption.po
index f6bffff3067b9b5668f8de6b6011aa1b18f8a951..a161caa55147f69e1e18423c714b8ffe0eb9e67f 100644
--- a/l10n/te/files_encryption.po
+++ b/l10n/te/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -54,14 +54,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -69,6 +69,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -80,7 +92,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -96,91 +108,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "వ్యక్తిగత అమరికలు"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/te/files_sharing.po b/l10n/te/files_sharing.po
index 3e0c6d01743ab4c0b835e46676df25064db880b4..cd51394df1569e08dbc7b68ac984de005f8376af 100644
--- a/l10n/te/files_sharing.po
+++ b/l10n/te/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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -18,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "సంకేతపదం"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr ""
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/te/files_trashbin.po b/l10n/te/files_trashbin.po
index a96a83e98dd354ea0c18b9ef233e40e5f367512f..4cf7c03680cd944d140cc61cfa56394d98a6678e 100644
--- a/l10n/te/files_trashbin.po
+++ b/l10n/te/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -27,42 +27,10 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "పొరపాటు"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "శాశ్వతంగా తొలగించు"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "పేరు"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -71,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "పేరు"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "తొలగించు"
 
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index 90eb60be589358deeb0e196093693dd48cdce74d..59679207ef0af9e24f1a0ed6a7f72eb2d44f9aee 100644
--- a/l10n/te/user_ldap.po
+++ b/l10n/te/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "సహాయం"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 0280fddae41944c1ce52ee4af4cb1ead1d87e9bf..8957048b27018ff53000b469403003f64c71c9c8 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 5.0.0\n"
+"Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\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"
@@ -57,45 +57,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -312,27 +273,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -341,7 +281,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr ""
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -373,7 +318,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr ""
 
@@ -445,30 +390,58 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a href="
@@ -505,7 +478,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr ""
 
@@ -549,7 +522,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr ""
 
@@ -561,6 +534,34 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -590,14 +591,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr ""
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -687,12 +680,12 @@ msgstr ""
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr ""
 
@@ -710,19 +703,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 9f6058029e0ac7fa84c7a848e8bbf07ac4053550..439b77d450307766c903a12f369745a5bfe3ab21 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 5.0.0\n"
+"Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\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"
@@ -75,15 +75,15 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr ""
 
@@ -91,36 +91,36 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr ""
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr ""
 
@@ -132,7 +132,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr ""
 
@@ -164,13 +164,13 @@ msgstr ""
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -226,25 +226,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr ""
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr ""
 
@@ -253,7 +253,7 @@ msgstr ""
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr ""
 
@@ -289,65 +289,65 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index f9c4c80753a6782d6d5b6659e36dc558e17b1dfc..dc91e848f6aa3f7d773522c430781a5227574727 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 5.0.0\n"
+"Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\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"
@@ -52,14 +52,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the "
 "encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private "
@@ -67,6 +67,17 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -78,7 +89,7 @@ msgid ""
 "the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -94,91 +105,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 25ae38c103b65edca57ab014d2e63bfd82bd573d..ccdf00c7d17be4afd6a48736ccbf2277615f0b74 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 5.0.0\n"
+"Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\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 a9e6278302a4ad9278390c1fde0b5e23804291f6..74010890e424414cf6513942ade2d2a49b1129fd 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 5.0.0\n"
+"Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\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"
@@ -18,15 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
-msgid "Password"
+msgid "The password is wrong. Try again."
 msgstr ""
 
-#: templates/authenticate.php:9
-msgid "Submit"
+#: templates/authenticate.php:10
+msgid "Password"
 msgstr ""
 
 #: templates/part.404.php:3
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 909543a021c7ab9942befed8723f85c3c987800a..11e3716ba4cd4a616b4f5f22056e040a689d64bb 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 5.0.0\n"
+"Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\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"
@@ -16,7 +16,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: ajax/delete.php:42
 #, php-format
@@ -28,55 +27,31 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:37
-msgid "delete file permanently"
+#: lib/trashbin.php:814 lib/trashbin.php:816
+msgid "restored"
 msgstr ""
 
-#: js/trash.js:129
-msgid "Delete permanently"
+#: templates/index.php:8
+msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: js/trash.js:190 templates/index.php:21
+#: templates/index.php:22
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/trashbin.php:814 lib/trashbin.php:816
-msgid "restored"
-msgstr ""
-
-#: templates/index.php:9
-msgid "Nothing in here. Your trash bin is empty!"
+#: templates/index.php:25 templates/index.php:27
+msgid "Restore"
 msgstr ""
 
-#: templates/index.php:24 templates/index.php:26
-msgid "Restore"
+#: templates/index.php:33
+msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:36 templates/index.php:37
 msgid "Delete"
 msgstr ""
 
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 3353d0cab9f68cf1dfcce08741c9bc13adefdcf5..41506ab82f4ab669b12119b6af980622f3a8f739 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 5.0.0\n"
+"Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index a65197deb5d63afd17607923948a09cb15e97622..5bf1d453de4cb5d381c7bbccfafa67dfa6ad0311 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 5.0.0\n"
+"Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\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"
@@ -18,38 +18,38 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: private/app.php:237
+#: private/app.php:243
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version "
 "of ownCloud."
 msgstr ""
 
-#: private/app.php:248
+#: private/app.php:254
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:352
+#: private/app.php:359
 msgid "Help"
 msgstr ""
 
-#: private/app.php:365
+#: private/app.php:372
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:376
+#: private/app.php:383
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:388
+#: private/app.php:395
 msgid "Users"
 msgstr ""
 
-#: private/app.php:401
+#: private/app.php:408
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:832
+#: private/app.php:839
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 066618ce9817260ad7b513a0b08262a416bfc3cd..ec769e950a786906b79ff41e9e013c132d54457f 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 5.0.0\n"
+"Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\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"
@@ -18,38 +18,38 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: app.php:237
+#: app.php:243
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version "
 "of ownCloud."
 msgstr ""
 
-#: app.php:248
+#: app.php:254
 msgid "No app name specified"
 msgstr ""
 
-#: app.php:352
+#: app.php:359
 msgid "Help"
 msgstr ""
 
-#: app.php:365
+#: app.php:372
 msgid "Personal"
 msgstr ""
 
-#: app.php:376
+#: app.php:383
 msgid "Settings"
 msgstr ""
 
-#: app.php:388
+#: app.php:395
 msgid "Users"
 msgstr ""
 
-#: app.php:401
+#: app.php:408
 msgid "Admin"
 msgstr ""
 
-#: app.php:832
+#: app.php:839
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 9cfa750026d2be436df368523ba565533cbe4a22..3a5866587f6502de2a96e23cb75d4682ee89cf60 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 5.0.0\n"
+"Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\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"
@@ -156,15 +156,15 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:225
+#: js/personal.js:220
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:270
+#: js/personal.js:265
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
-#: js/personal.js:292
+#: js/personal.js:287
 msgid "Saving..."
 msgstr ""
 
@@ -180,32 +180,32 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: js/users.js:95 templates/users.php:26 templates/users.php:90
 #: templates/users.php:118
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:97 templates/users.php:92 templates/users.php:130
+#: js/users.js:100 templates/users.php:92 templates/users.php:130
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:120 templates/users.php:170
+#: js/users.js:123 templates/users.php:170
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:277
+#: js/users.js:280
 msgid "add group"
 msgstr ""
 
-#: js/users.js:436
+#: js/users.js:442
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:437 js/users.js:443 js/users.js:458
+#: js/users.js:443 js/users.js:449 js/users.js:464
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:442
+#: js/users.js:448
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -382,11 +382,11 @@ msgstr ""
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:161
+#: templates/admin.php:250 templates/personal.php:169
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:164
+#: templates/admin.php:254 templates/personal.php:172
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
 "\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
@@ -525,34 +525,34 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:119
+#: templates/personal.php:126
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:125
+#: templates/personal.php:133
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:127
+#: templates/personal.php:135
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:138
+#: templates/personal.php:146
 msgid "Encryption"
 msgstr ""
 
-#: templates/personal.php:140
+#: templates/personal.php:148
 msgid "The encryption app is no longer enabled, decrypt all your file"
 msgstr ""
 
-#: templates/personal.php:146
+#: templates/personal.php:154
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:151
+#: templates/personal.php:159
 msgid "Decrypt all Files"
 msgstr ""
 
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 6e22c561174e228c1e7e8c41186793654e7322c1..fffacde7c79bb6b1b2ec019e813dd1214af0585b 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 5.0.0\n"
+"Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\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"
@@ -366,14 +366,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -387,18 +391,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr ""
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index b1e4e8fff68a86635db1142867ead0cf0ccae7a1..ce8d87f0f6c005664fb776dafe2255af7d1a946b 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 5.0.0\n"
+"Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\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 50151bd737b061d8966b8a94377823fb9f22ff71..73185856e9f0cc6c84f046c2befddd5434089a99 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 "ยังไม่ได้ระบุรหัส %s"
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "เกิดข้อผิดพลาดในการเพิ่ม %s เข้าไปยังรายการโปรด"
-
-#: 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 "เกิดข้อผิดพลาดในการลบ %s ออกจากรายการโปรด"
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -306,27 +267,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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 "ไฟล์ {file} ซึ่งเป็นไฟล์ที่จำเป็นต้องได้รับการติดตั้งไว้ก่อน ยังไม่ได้ถูกติดตั้ง"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "แชร์แล้ว"
@@ -335,7 +275,12 @@ msgstr "แชร์แล้ว"
 msgid "Share"
 msgstr "แชร์"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "ข้อผิดพลาด"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล"
 
@@ -367,7 +312,7 @@ msgstr "แชร์ด้วยลิงก์"
 msgid "Password protect"
 msgstr "ใส่รหัสผ่านไว้"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "รหัสผ่าน"
 
@@ -439,30 +384,58 @@ msgstr "ลบ"
 msgid "share"
 msgstr "แชร์"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "ใส่รหัสผ่านไว้"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "กำลังส่ง..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "ส่งอีเมล์แล้ว"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "คำเตือน"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "ชนิดของวัตถุยังไม่ได้รับการระบุ"
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "ลบ"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "เพิ่ม"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -499,7 +472,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์"
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "ชื่อผู้ใช้งาน"
 
@@ -543,7 +516,7 @@ msgstr "ส่วนตัว"
 msgid "Users"
 msgstr "ผู้ใช้งาน"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "แอปฯ"
 
@@ -555,6 +528,34 @@ msgstr "ผู้ดูแล"
 msgid "Help"
 msgstr "ช่วยเหลือ"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "การเข้าถึงถูกหวงห้าม"
@@ -584,14 +585,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "แก้ไขหมวดหมู่"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "เพิ่ม"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -681,12 +674,12 @@ msgstr "ติดตั้งเรียบร้อยแล้ว"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "ออกจากระบบ"
 
@@ -704,19 +697,27 @@ msgstr "หากคุณยังไม่ได้เปลี่ยนรห
 msgid "Please change your password to secure your account again."
 msgstr "กรุณาเปลี่ยนรหัสผ่านของคุณอีกครั้ง เพื่อป้องกันบัญชีของคุณให้ปลอดภัย"
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "ลืมรหัสผ่าน?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "จำรหัสผ่าน"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "เข้าสู่ระบบ"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 877917c0b500900188f7f17717adb4b7b928d829..27ccb70945562fe574f1f3dca629b212752b7457 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -74,15 +74,15 @@ msgstr "เขียนข้อมูลลงแผ่นดิสก์ล้
 msgid "Not enough storage available"
 msgstr "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "ไดเร็กทอรี่ไม่ถูกต้อง"
 
@@ -90,36 +90,36 @@ msgstr "ไดเร็กทอรี่ไม่ถูกต้อง"
 msgid "Files"
 msgstr "ไฟล์"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "มีพื้นที่เหลือไม่เพียงพอ"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "การอัพโหลดถูกยกเลิก"
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก"
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL ไม่สามารถเว้นว่างได้"
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
@@ -131,7 +131,7 @@ msgstr "แชร์"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "เปลี่ยนชื่อ"
 
@@ -163,12 +163,12 @@ msgstr "แทนที่ {new_name} ด้วย {old_name} แล้ว"
 msgid "undo"
 msgstr "เลิกทำ"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -223,25 +223,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่"
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "ชื่อ"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "ขนาด"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "แก้ไขแล้ว"
 
@@ -250,7 +250,7 @@ msgstr "แก้ไขแล้ว"
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "อัพโหลด"
 
@@ -286,65 +286,65 @@ msgstr "ขนาดไฟล์ ZIP สูงสุด"
 msgid "Save"
 msgstr "บันทึก"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "อัพโหลดไฟล์ใหม่"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "ไฟล์ข้อความ"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "แฟ้มเอกสาร"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "จากลิงก์"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "ยกเลิกการอัพโหลด"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "ดาวน์โหลด"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "ยกเลิกการแชร์"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "ลบ"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้"
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "ไฟล์ที่กำลังสแกนอยู่ขณะนี้"
 
diff --git a/l10n/th_TH/files_encryption.po b/l10n/th_TH/files_encryption.po
index a9e0be2e60ba533749e9ffd34a1296d9df216948..180c98b4fa73581021e1004efeffeca1221960b9 100644
--- a/l10n/th_TH/files_encryption.po
+++ b/l10n/th_TH/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "การเข้ารหัส"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index 467e3de3d83265550e0b8a6db3a32d7775407809..7049133ac0bf6684b6e04e72a0f28d8cdbe802fb 100644
--- a/l10n/th_TH/files_sharing.po
+++ b/l10n/th_TH/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "ส่ง"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ได้แชร์โฟลเดอร์ %s ให้กับคุณ"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ได้แชร์ไฟล์ %s ให้กับคุณ"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "ดาวน์โหลด"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "อัพโหลด"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "ยกเลิกการอัพโหลด"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "ไม่สามารถดูตัวอย่างได้สำหรับ"
diff --git a/l10n/th_TH/files_trashbin.po b/l10n/th_TH/files_trashbin.po
index c54132eb7626d4a4a68cd22594d3d3c8b386ca02..c349231cc3be66a9c3ce99afe64f35178c1b58a8 100644
--- a/l10n/th_TH/files_trashbin.po
+++ b/l10n/th_TH/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -27,40 +27,10 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "ดำเนินการคืนค่า"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr ""
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "ชื่อ"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "ลบแล้ว"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -69,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "ไม่มีอะไรอยู่ในนี้ ถังขยะของคุณยังว่างอยู่"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "ชื่อ"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "คืนค่า"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "ลบแล้ว"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "ลบ"
 
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index f59f5c8333d82d9de0ff9696d3d892498a90db6e..e5b9f4bd3ee38fc94909470cbbaba6262ea12d67 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "ช่วยเหลือ"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 8e924aff4de6ba23fd3963e1d4dd57454317a831..a0f0ac6e01d10d5cedd678ef44865424d100ca0d 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -59,56 +59,17 @@ msgstr "Dosya önbelleği güncellendi"
 msgid "... %d%% done ..."
 msgstr "%%%d tamamlandı ..."
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Kategori türü girilmedi."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Eklenecek kategori yok?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Bu kategori zaten mevcut:  %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Nesne türü desteklenmemektedir."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID belirtilmedi."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "%s favorilere eklenirken hata oluştu"
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Silmek için bir kategori seçilmedi"
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "%s favorilere çıkarılırken hata oluştu"
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
 
 #: avatar/controller.php:81
 msgid "Unknown filetype"
-msgstr ""
+msgstr "Bilinmeyen dosya türü"
 
 #: avatar/controller.php:85
 msgid "Invalid image"
-msgstr ""
+msgstr "Geçersiz resim"
 
 #: avatar/controller.php:115 avatar/controller.php:142
 msgid "No temporary profile picture available, try again"
@@ -314,27 +275,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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 "Nesne türü belirtilmemiş."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Hata"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "uygulama adı belirtilmedi."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "İhtiyaç duyulan {file} dosyası kurulu değil."
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Paylaşılan"
@@ -343,7 +283,12 @@ msgstr "Paylaşılan"
 msgid "Share"
 msgstr "Paylaş"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Hata"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Paylaşım sırasında hata  "
 
@@ -375,7 +320,7 @@ msgstr "Bağlantı ile paylaş"
 msgid "Password protect"
 msgstr "Şifre korunması"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Parola"
 
@@ -447,30 +392,58 @@ msgstr "sil"
 msgid "share"
 msgstr "paylaş"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Paralo korumalı"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Geçerlilik tarihi tanımlama kaldırma hatası"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Geçerlilik tarihi tanımlama hatası"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Gönderiliyor..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Eposta gönderildi"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Uyarı"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Nesne türü belirtilmemiş."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Sil"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Ekle"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -507,7 +480,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Parolanızı sıfırlamak için bir bağlantı Eposta olarak gönderilecek."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Kullanıcı Adı"
 
@@ -551,7 +524,7 @@ msgstr "Kişisel"
 msgid "Users"
 msgstr "Kullanıcılar"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Uygulamalar"
 
@@ -563,6 +536,34 @@ msgstr "Yönetici"
 msgid "Help"
 msgstr "Yardım"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Erişim yasaklı"
@@ -592,14 +593,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Kategorileri düzenle"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Ekle"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -689,12 +682,12 @@ msgstr "Kurulumu tamamla"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s mevcuttur. Güncelleştirme hakkında daha fazla bilgi alın."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Çıkış yap"
 
@@ -712,19 +705,27 @@ msgstr "Yakın zamanda parolanızı değiştirmedi iseniz hesabınız riske gire
 msgid "Please change your password to secure your account again."
 msgstr "Hesabınızı korumak için lütfen parolanızı değiştirin."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Parolanızı mı unuttunuz?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "hatırla"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Giriş yap"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Alternatif Girişler"
 
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 397ed7bd9636a3f07bf4c63178d966b0779b04f9..a28838f2fbed2d9cba3fcaa6f83e6886e63f2a25 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -77,15 +77,15 @@ msgstr "Diske yazılamadı"
 msgid "Not enough storage available"
 msgstr "Yeterli disk alanı yok"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Geçersiz dizin."
 
@@ -93,36 +93,36 @@ msgstr "Geçersiz dizin."
 msgid "Files"
 msgstr "Dosyalar"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Yeterli disk alanı yok"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Yükleme iptal edildi."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL boş olamaz."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Geçersiz dizin adı. 'Shared' dizin ismi kullanımı ownCloud tarafından rezerve edilmiştir."
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Hata"
 
@@ -134,7 +134,7 @@ msgstr "Paylaş"
 msgid "Delete permanently"
 msgstr "Kalıcı olarak sil"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "İsim değiştir."
 
@@ -166,13 +166,13 @@ msgstr "{new_name} ismi {old_name} ile değiştirildi"
 msgid "undo"
 msgstr "geri al"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n dizin"
 msgstr[1] "%n dizin"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n dosya"
@@ -229,25 +229,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Şifreleme işlemi durduruldu ancak dosyalarınız şifreli. Dosyalarınızın şifresini kaldırmak için lütfen kişisel ayarlar kısmına geçiniz."
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "İsim"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Boyut"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Değiştirilme"
 
@@ -256,7 +256,7 @@ msgstr "Değiştirilme"
 msgid "%s could not be renamed"
 msgstr "%s yeniden adlandırılamadı"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Yükle"
 
@@ -292,65 +292,65 @@ msgstr "ZIP dosyaları için en fazla girdi sayısı"
 msgid "Save"
 msgstr "Kaydet"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Yeni"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Metin dosyası"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Klasör"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Bağlantıdan"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Dosyalar silindi"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Yüklemeyi iptal et"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Buraya erişim hakkınız yok."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Burada hiçbir şey yok. Birşeyler yükleyin!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "İndir"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Paylaşılmayan"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Sil"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Yükleme çok büyük"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Dosyalar taranıyor, lütfen bekleyin."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Güncel tarama"
 
diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po
index 90a55700eff55186da4fcd8509b4c8e2df0ef501..7d868cb5af9774f851b826d249567a0710f77f12 100644
--- a/l10n/tr/files_encryption.po
+++ b/l10n/tr/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -54,14 +54,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -69,6 +69,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -80,7 +92,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -96,91 +108,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Şifreleme"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Etkinleştirildi"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Devre dışı"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Parola değiştir"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "Dosya kurtarma ayarları güncellendi"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "Dosya kurtarma güncellenemedi"
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index eea57d4dbd17455db191603b02c73da0f6b9023c..24c29df717e1229ce7fb77d696d8a0f6e9f7c716 100644
--- a/l10n/tr/files_sharing.po
+++ b/l10n/tr/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Parola"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Gönder"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s sizinle paylaşılan  %s klasör"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s sizinle paylaşılan  %s klasör"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "İndir"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Yükle"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Yüklemeyi iptal et"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Kullanılabilir önizleme yok"
diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po
index 431d26bfe7a9e878acd4e6f5650b603dd0556b29..fde740bdd346f9376f6a38ff5811abfc283cefa4 100644
--- a/l10n/tr/files_trashbin.po
+++ b/l10n/tr/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: tridinebandim\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,42 +28,10 @@ msgstr "%s Kalıcı olarak silinemedi"
 msgid "Couldn't restore %s"
 msgstr "%s Geri yüklenemedi"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "Geri yükleme işlemini gerçekleştir"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Hata"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "Dosyayı kalıcı olarak sil"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Kalıcı olarak sil"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "İsim"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Silindi"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] "%n dizin"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] "%n dosya"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "geri yüklendi"
@@ -72,11 +40,19 @@ msgstr "geri yüklendi"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Burası boş. Çöp kutun tamamen boş."
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "İsim"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Geri yükle"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Silindi"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Sil"
 
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index 6a247032c23131f8011aa9fb4233bf1f2d91d748..3d7178c5ba15f3526510656bb59c2f51ca01ed62 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/lib.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Caner BAŞARAN <basaran.caner@gmail.com>, 2013
 # ismail yenigül <ismail.yenigul@surgate.com>, 2013
 # tridinebandim, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-08 21:50+0000\n"
+"Last-Translator: Caner BAŞARAN <basaran.caner@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,53 +20,53 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: private/app.php:237
+#: private/app.php:243
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "Owncloud yazılımının bu sürümü ile uyumlu  olmadığı için \"%s\" uygulaması kurulamaz."
 
-#: private/app.php:248
+#: private/app.php:254
 msgid "No app name specified"
 msgstr "Uygulama adı belirtimedli"
 
-#: private/app.php:352
+#: private/app.php:359
 msgid "Help"
 msgstr "Yardım"
 
-#: private/app.php:365
+#: private/app.php:372
 msgid "Personal"
 msgstr "Kişisel"
 
-#: private/app.php:376
+#: private/app.php:383
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: private/app.php:388
+#: private/app.php:395
 msgid "Users"
 msgstr "Kullanıcılar"
 
-#: private/app.php:401
+#: private/app.php:408
 msgid "Admin"
 msgstr "Yönetici"
 
-#: private/app.php:832
+#: private/app.php:839
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "\"%s\" yükseltme başarısız oldu."
 
 #: private/avatar.php:56
 msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
+msgstr "Hala özel profil resminiz şifreleme ile çalışmıyor"
 
 #: private/avatar.php:64
 msgid "Unknown filetype"
-msgstr ""
+msgstr "Bilinmeyen dosya türü"
 
 #: private/avatar.php:69
 msgid "Invalid image"
-msgstr ""
+msgstr "Geçersiz resim"
 
 #: private/defaults.php:36
 msgid "web services under your control"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index 34a5b99bd6e436fddb83e2d112f7a017adb10758..1b8fd4c21948108cbe8bce53736d8cc5ff386305 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -370,14 +370,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -391,18 +395,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Yardım"
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index a53d2a196b8b3debc130574463720818cea06f00..77f0612a2cb28dd41ce082e80293b5b442ea31f6 100644
--- a/l10n/ug/core.po
+++ b/l10n/ug/core.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Uighur <uqkun@outlook.com>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -306,27 +267,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -335,7 +275,12 @@ msgstr ""
 msgid "Share"
 msgstr "ھەمبەھىر"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "خاتالىق"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr ""
 
@@ -367,7 +312,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "ئىم"
 
@@ -439,30 +384,58 @@ msgstr "ئۆچۈر"
 msgid "share"
 msgstr "ھەمبەھىر"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "ئاگاھلاندۇرۇش"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "ئۆچۈر"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "قوش"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -499,7 +472,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "ئىشلەتكۈچى ئاتى"
 
@@ -543,7 +516,7 @@ msgstr "شەخسىي"
 msgid "Users"
 msgstr "ئىشلەتكۈچىلەر"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "ئەپلەر"
 
@@ -555,6 +528,34 @@ msgstr ""
 msgid "Help"
 msgstr "ياردەم"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -584,14 +585,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "تۈر تەھرىر"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "قوش"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -681,12 +674,12 @@ msgstr "تەڭشەك تامام"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "تىزىمدىن چىق"
 
@@ -704,19 +697,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ug/files.po b/l10n/ug/files.po
index 7f3c7d56126515169a97d870c1bd5f547a611cd7..7fe8a8d7a3a0c97763ec63e28b0eb9c4b7368098 100644
--- a/l10n/ug/files.po
+++ b/l10n/ug/files.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Uighur <uqkun@outlook.com>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -74,15 +74,15 @@ msgstr "دىسكىغا يازالمىدى"
 msgid "Not enough storage available"
 msgstr "يېتەرلىك ساقلاش بوشلۇقى يوق"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr ""
 
@@ -90,36 +90,36 @@ msgstr ""
 msgid "Files"
 msgstr "ھۆججەتلەر"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "يېتەرلىك بوشلۇق يوق"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "يۈكلەشتىن ۋاز كەچتى."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "خاتالىق"
 
@@ -131,7 +131,7 @@ msgstr "ھەمبەھىر"
 msgid "Delete permanently"
 msgstr "مەڭگۈلۈك ئۆچۈر"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "ئات ئۆزگەرت"
 
@@ -163,12 +163,12 @@ msgstr ""
 msgid "undo"
 msgstr "يېنىۋال"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -223,25 +223,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "ئاتى"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "چوڭلۇقى"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "ئۆزگەرتكەن"
 
@@ -250,7 +250,7 @@ msgstr "ئۆزگەرتكەن"
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "يۈكلە"
 
@@ -286,65 +286,65 @@ msgstr ""
 msgid "Save"
 msgstr "ساقلا"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "يېڭى"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "تېكىست ھۆججەت"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "قىسقۇچ"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "ئۆچۈرۈلگەن ھۆججەتلەر"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "يۈكلەشتىن ۋاز كەچ"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "بۇ جايدا ھېچنېمە يوق. Upload something!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "چۈشۈر"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "ھەمبەھىرلىمە"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "ئۆچۈر"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "يۈكلەندىغىنى بەك چوڭ"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/ug/files_encryption.po b/l10n/ug/files_encryption.po
index 529b8ab659914b6ec48b519766d880e701895d5c..098a668d1d4278bd313579de9cdfb8999f1afd6f 100644
--- a/l10n/ug/files_encryption.po
+++ b/l10n/ug/files_encryption.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Uighur <uqkun@outlook.com>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "شىفىرلاش"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ug/files_sharing.po b/l10n/ug/files_sharing.po
index b1dd5be96431f8c3c289a6677d49f844799da575..fbfd33fa79789e03ea0544107a52f5f97c0d39f5 100644
--- a/l10n/ug/files_sharing.po
+++ b/l10n/ug/files_sharing.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Uighur <uqkun@outlook.com>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "ئىم"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "تاپشۇر"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -54,28 +54,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "چۈشۈر"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "يۈكلە"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "يۈكلەشتىن ۋاز كەچ"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/ug/files_trashbin.po b/l10n/ug/files_trashbin.po
index 103286687b00a6c3a08be1e9e64d8211cb058d93..43620ad0c2e091fa129d5013b75712f0e6e7eccb 100644
--- a/l10n/ug/files_trashbin.po
+++ b/l10n/ug/files_trashbin.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Uighur <uqkun@outlook.com>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,40 +27,10 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "خاتالىق"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "مەڭگۈلۈك ئۆچۈر"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "ئاتى"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "ئۆچۈرۈلدى"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -69,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "بۇ جايدا ھېچنېمە يوق. Your trash bin is empty!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "ئاتى"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "ئۆچۈرۈلدى"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "ئۆچۈر"
 
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
index 23d2804c30bec4e0681ab0ecfada72309f34a861..e9dddab50d28e5021871daa13b9f8c6d553f415b 100644
--- a/l10n/ug/user_ldap.po
+++ b/l10n/ug/user_ldap.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Uighur <uqkun@outlook.com>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "ياردەم"
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index a8da69503bbf5c19cbb8c9c322d9659a660f6172..c9dc1acce53cf8a5e54c562f4d76e1d73456b715 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:31+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 "Ця категорія вже існує: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Не вказано тип об'єкту."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID не вказано."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Помилка при додаванні %s до обраного."
-
-#: 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 "Помилка при видалені %s із обраного."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -316,27 +277,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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 "Необхідний файл {file} не встановлено!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Опубліковано"
@@ -345,7 +285,12 @@ msgstr "Опубліковано"
 msgid "Share"
 msgstr "Поділитися"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Помилка"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Помилка під час публікації"
 
@@ -377,7 +322,7 @@ msgstr "Опублікувати через посилання"
 msgid "Password protect"
 msgstr "Захистити паролем"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Пароль"
 
@@ -449,30 +394,58 @@ msgstr "видалити"
 msgid "share"
 msgstr "опублікувати"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Захищено паролем"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Помилка при відміні терміна дії"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Помилка при встановленні терміна дії"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Надсилання..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Ел. пошта надіслана"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Попередження"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Не визначено тип об'єкту."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Видалити"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Додати"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -509,7 +482,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Ім'я користувача"
 
@@ -553,7 +526,7 @@ msgstr "Особисте"
 msgid "Users"
 msgstr "Користувачі"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Додатки"
 
@@ -565,6 +538,34 @@ msgstr "Адмін"
 msgid "Help"
 msgstr "Допомога"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Доступ заборонено"
@@ -594,14 +595,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Редагувати категорії"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Додати"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -691,12 +684,12 @@ msgstr "Завершити налаштування"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Вихід"
 
@@ -714,19 +707,27 @@ msgstr "Якщо Ви не міняли пароль останнім часом
 msgid "Please change your password to secure your account again."
 msgstr "Будь ласка, змініть свій пароль, щоб знову захистити Ваш обліковий запис."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Забули пароль?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "запам'ятати"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Вхід"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Альтернативні Логіни"
 
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index cbae1aabd0903d0372a9cf4f8f6ed692b8a5662a..36b41721db85a937f37b6a68cc15a82136359e59 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -75,15 +75,15 @@ msgstr "Невдалося записати на диск"
 msgid "Not enough storage available"
 msgstr "Місця більше немає"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Невірний каталог."
 
@@ -91,36 +91,36 @@ msgstr "Невірний каталог."
 msgid "Files"
 msgstr "Файли"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Місця більше немає"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Завантаження перервано."
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL не може бути пустим."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Неправильне ім'я теки. Використання 'Shared' зарезервовано ownCloud"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Помилка"
 
@@ -132,7 +132,7 @@ msgstr "Поділитися"
 msgid "Delete permanently"
 msgstr "Видалити назавжди"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Перейменувати"
 
@@ -164,14 +164,14 @@ msgstr "замінено {new_name} на {old_name}"
 msgid "undo"
 msgstr "відмінити"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n тека"
 msgstr[1] "%n тека"
 msgstr[2] "%n теки"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -230,25 +230,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Ім'я"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Розмір"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Змінено"
 
@@ -257,7 +257,7 @@ msgstr "Змінено"
 msgid "%s could not be renamed"
 msgstr "%s не може бути перейменований"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Вивантажити"
 
@@ -293,65 +293,65 @@ msgstr "Максимальний розмір завантажуємого ZIP 
 msgid "Save"
 msgstr "Зберегти"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Створити"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Текстовий файл"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Тека"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "З посилання"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "Видалено файлів"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Перервати завантаження"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "У вас тут немає прав на запис."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Тут нічого немає. Відвантажте що-небудь!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Завантажити"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Закрити доступ"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Видалити"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Файл занадто великий"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Файли скануються, зачекайте, будь-ласка."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Поточне сканування"
 
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
index 24aa22b936e7ae50a178982f8c5c69d0ee0c303d..babec257777f06278d2c85f0f5cdc4dd40ec200f 100644
--- a/l10n/uk/files_encryption.po
+++ b/l10n/uk/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -54,14 +54,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -69,6 +69,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -80,7 +92,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -96,91 +108,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "особисті налаштування"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Шифрування"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Змінити Пароль"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index c12dc78801e6908db1f52d7e7ec5c484f05e852c..206c646ce796df6b8182ddd046e77834b348b148 100644
--- a/l10n/uk/files_sharing.po
+++ b/l10n/uk/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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,17 +18,17 @@ msgstr ""
 "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"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Передати"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s опублікував каталог %s для Вас"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s опублікував файл %s для Вас"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Завантажити"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Вивантажити"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Перервати завантаження"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Попередній перегляд недоступний для"
diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po
index ce817bd5a2666297815b4941ea84a6becbfb0e02..48733531cca53de36656774943046a9ce0271a0e 100644
--- a/l10n/uk/files_trashbin.po
+++ b/l10n/uk/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -28,44 +28,10 @@ msgstr "Неможливо видалити %s назавжди"
 msgid "Couldn't restore %s"
 msgstr "Неможливо відновити %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "виконати операцію відновлення"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Помилка"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "видалити файл назавжди"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Видалити назавжди"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Ім'я"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Видалено"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "відновлено"
@@ -74,11 +40,19 @@ msgstr "відновлено"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Нічого немає. Ваший кошик для сміття пустий!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Ім'я"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Відновити"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Видалено"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Видалити"
 
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index ef8068cc5420eccd271b9871b04a246ea4e32f36..42346f31accb6eef12282a3cd68a77750494e7aa 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "Тестове налаштування"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Допомога"
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index 3133d29f6cb265b381eb39278ece038fae26dde2..2281be7ecc31e2bd6e98677f325599a393335dcd 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -311,27 +272,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr ""
@@ -340,7 +280,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "ایرر"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "شئیرنگ کے دوران ایرر"
 
@@ -372,7 +317,7 @@ msgstr "لنک کے ساتھ شئیر کریں"
 msgid "Password protect"
 msgstr "پاسورڈ سے محفوظ کریں"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "پاسورڈ"
 
@@ -444,30 +389,58 @@ msgstr "ختم کریں"
 msgid "share"
 msgstr "شئیر کریں"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "پاسورڈ سے محفوظ کیا گیا ہے"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "شامل کریں"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -504,7 +477,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے"
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "یوزر نیم"
 
@@ -548,7 +521,7 @@ msgstr "ذاتی"
 msgid "Users"
 msgstr "یوزرز"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "ایپز"
 
@@ -560,6 +533,34 @@ msgstr "ایڈمن"
 msgid "Help"
 msgstr "مدد"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "پہنچ کی اجازت نہیں"
@@ -589,14 +590,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "زمرہ جات کی تدوین کریں"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "شامل کریں"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -686,12 +679,12 @@ msgstr "سیٹ اپ ختم کریں"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "لاگ آؤٹ"
 
@@ -709,19 +702,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "کیا آپ پاسورڈ بھول گئے ہیں؟"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "یاد رکھیں"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "لاگ ان"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ur_PK/files_encryption.po b/l10n/ur_PK/files_encryption.po
index 627123bd44a8eac9f9097d6fba41c1a472b19c8a..1a207a03c60f0132c12b29786f916223ca758b68 100644
--- a/l10n/ur_PK/files_encryption.po
+++ b/l10n/ur_PK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ur_PK/files_sharing.po b/l10n/ur_PK/files_sharing.po
index 0d12edb3665e285b629c75f93f6e3b74a6c61bf5..773c095675a6149d9c3a2af632a837aed59d3031 100644
--- a/l10n/ur_PK/files_sharing.po
+++ b/l10n/ur_PK/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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -18,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "پاسورڈ"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr ""
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/ur_PK/files_trashbin.po b/l10n/ur_PK/files_trashbin.po
index 3056d8fb9538a7b8e735a7958ae3e1f9966fd821..3673a0eda0e500f393ce8792a7a0e8d656fde55e 100644
--- a/l10n/ur_PK/files_trashbin.po
+++ b/l10n/ur_PK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,42 +27,10 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "ایرر"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr ""
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr ""
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -71,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr ""
 
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index d79a6ad3ff694d69fec3a09af9aede4c0bd72204..6a4acc765b2b6b0760afe2ffa6aa92d7ccdce76a 100644
--- a/l10n/ur_PK/user_ldap.po
+++ b/l10n/ur_PK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "مدد"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index fd046e18f1faa646faa97c0fc9eaaf265923b1ea..583a12584060f7b75fd48f91240e35e27f8ba4c4 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -57,45 +57,6 @@ msgstr ""
 msgid "... %d%% done ..."
 msgstr ""
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr "Kiểu hạng mục không được cung cấp."
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr "Không có danh mục được thêm?"
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr "Danh mục này đã tồn tại: %s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "Loại đối tượng không được cung cấp."
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID không được cung cấp."
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "Lỗi thêm %s vào mục yêu thích."
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr "Bạn chưa chọn mục để xóa"
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr "Lỗi xóa %s từ mục yêu thích."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -307,27 +268,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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 "Loại đối tượng không được chỉ định."
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "Lỗi"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "Tên ứng dụng không được chỉ định."
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "Tập tin cần thiết {file} không được cài đặt!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "Được chia sẻ"
@@ -336,7 +276,12 @@ msgstr "Được chia sẻ"
 msgid "Share"
 msgstr "Chia sẻ"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "Lỗi"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "Lỗi trong quá trình chia sẻ"
 
@@ -368,7 +313,7 @@ msgstr "Chia sẻ với liên kết"
 msgid "Password protect"
 msgstr "Mật khẩu bảo vệ"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Mật khẩu"
 
@@ -440,30 +385,58 @@ msgstr "xóa"
 msgid "share"
 msgstr "chia sẻ"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "Mật khẩu bảo vệ"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "Lỗi không thiết lập ngày kết thúc"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "Lỗi cấu hình ngày kết thúc"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "Đang gởi ..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Email đã được gửi"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "Cảnh báo"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "Loại đối tượng không được chỉ định."
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Xóa"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Thêm"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -500,7 +473,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "Vui lòng kiểm tra Email để khôi phục lại mật khẩu."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "Tên đăng nhập"
 
@@ -544,7 +517,7 @@ msgstr "Cá nhân"
 msgid "Users"
 msgstr "Người dùng"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "Ứng dụng"
 
@@ -556,6 +529,34 @@ msgstr "Quản trị"
 msgid "Help"
 msgstr "Giúp đỡ"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "Truy cập bị cấm"
@@ -585,14 +586,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Sửa chuyên mục"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Thêm"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -682,12 +675,12 @@ msgstr "Cài đặt hoàn tất"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s còn trống. Xem thêm thông tin cách cập nhật."
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "Đăng xuất"
 
@@ -705,19 +698,27 @@ msgstr "Nếu bạn không thay đổi mật khẩu gần đây của bạn, tà
 msgid "Please change your password to secure your account again."
 msgstr "Vui lòng thay đổi mật khẩu của bạn để đảm bảo tài khoản của bạn một lần nữa."
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "Bạn quên mật khẩu ?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "ghi nhớ"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "Đăng nhập"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "Đăng nhập khác"
 
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index 74b8446e5bbfc24ae21272fc04b1da91168ccd0e..df55610bf66be244b2339a792af3852184cfb102 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -75,15 +75,15 @@ msgstr "Không thể ghi "
 msgid "Not enough storage available"
 msgstr "Không đủ không gian lưu trữ"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "Thư mục không hợp lệ"
 
@@ -91,36 +91,36 @@ msgstr "Thư mục không hợp lệ"
 msgid "Files"
 msgstr "Tập tin"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "Không đủ chỗ trống cần thiết"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "Hủy tải lên"
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này."
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL không được để trống."
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "Lỗi"
 
@@ -132,7 +132,7 @@ msgstr "Chia sẻ"
 msgid "Delete permanently"
 msgstr "Xóa vĩnh vễn"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "Sửa tên"
 
@@ -164,12 +164,12 @@ msgstr "đã thay thế {new_name} bằng {old_name}"
 msgid "undo"
 msgstr "lùi lại"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -224,25 +224,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Your download is being prepared. This might take some time if the files are big."
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Tên"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "Kích cỡ"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "Thay đổi"
 
@@ -251,7 +251,7 @@ msgstr "Thay đổi"
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "Tải lên"
 
@@ -287,65 +287,65 @@ msgstr "Kích thước tối đa cho các tập tin ZIP"
 msgid "Save"
 msgstr "Lưu"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Mới"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "Tập tin văn bản"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "Thư mục"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "Từ liên kết"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "File đã bị xóa"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "Hủy upload"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "Bạn không có quyền ghi vào đây."
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "Không có gì ở đây .Hãy tải lên một cái gì đó !"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "Tải về"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "Bỏ chia sẻ"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "Xóa"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "Tập tin tải lên quá lớn"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ ."
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Tập tin đang được quét ,vui lòng chờ."
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "Hiện tại đang quét"
 
diff --git a/l10n/vi/files_encryption.po b/l10n/vi/files_encryption.po
index acda5db65aa9b86deb115cf507309b6c2622a1b5..1d2bdd714c876c7c39b3d19fbe19293bd8b7cac5 100644
--- a/l10n/vi/files_encryption.po
+++ b/l10n/vi/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -54,14 +54,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -69,6 +69,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -80,7 +92,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -96,91 +108,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "Mã hóa"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "Bật"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "Tắt"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "Đổi Mật khẩu"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index f370ab63c638bbcedf46b588a96cf960d7d03c40..bdf0ade0517cca5aa9f4f0c77cc0994a67aaf39a 100644
--- a/l10n/vi/files_sharing.po
+++ b/l10n/vi/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -18,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Xác nhận"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s đã chia sẻ thư mục %s với bạn"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s đã chia sẻ tập tin %s với bạn"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Tải về"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "Tải lên"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "Hủy upload"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "Không có xem trước cho"
diff --git a/l10n/vi/files_trashbin.po b/l10n/vi/files_trashbin.po
index 6abf104c6a453a2d3dfb992c879bb52d8073340b..2f8df27304178341bd62c78601199222431f0a35 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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,40 +27,10 @@ msgstr "Không thể óa %s vĩnh viễn"
 msgid "Couldn't restore %s"
 msgstr "Không thể khôi phục %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "thực hiện phục hồi"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "Lỗi"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "xóa file vĩnh viễn"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "Xóa vĩnh vễn"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "Tên"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "Đã xóa"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -69,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Không có gì ở đây. Thùng rác của bạn rỗng!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "Tên"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "Khôi phục"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "Đã xóa"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "Xóa"
 
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 6bcd44e766a3d06a7acf90897cba0ef0df003adc..732d66664ed9690850a5467d3b25c415519de17a 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "Giúp đỡ"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 6ccbe49cfa974c873db5f9e925968f5f07b6292b..dd547cc443ac3fa1d9d4ce0876cd8abf2c2e1240 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:30+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -59,45 +59,6 @@ msgstr "文件缓存已更新"
 msgid "... %d%% done ..."
 msgstr "...已完成 %d%% ..."
 
-#: 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 "此分类已存在:%s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "未提供对象类型。"
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "%s ID未提供。"
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "向收藏夹中新增%s时出错。"
-
-#: 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 "从收藏夹中移除%s时出错。"
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -309,27 +270,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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 "所需文件{file}未安装!"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "已共享"
@@ -338,7 +278,12 @@ msgstr "已共享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "错误"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "共享时出错"
 
@@ -370,7 +315,7 @@ msgstr "共享链接"
 msgid "Password protect"
 msgstr "密码保护"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "密码"
 
@@ -442,30 +387,58 @@ msgstr "删除"
 msgid "share"
 msgstr "共享"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "密码已受保护"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "取消设置过期日期时出错"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "设置过期日期时出错"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "正在发送..."
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "邮件已发送"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "警告"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "未指定对象类型。"
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "删除"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "增加"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -502,7 +475,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "您将会收到包含可以重置密码链接的邮件。"
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "用户名"
 
@@ -546,7 +519,7 @@ msgstr "个人"
 msgid "Users"
 msgstr "用户"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "应用"
 
@@ -558,6 +531,34 @@ msgstr "管理"
 msgid "Help"
 msgstr "帮助"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "访问禁止"
@@ -587,14 +588,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "编辑分类"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "增加"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -684,12 +677,12 @@ msgstr "安装完成"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s 可用。获取更多关于如何升级的信息。"
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "注销"
 
@@ -707,19 +700,27 @@ msgstr "如果您没有最近修改您的密码,您的帐户可能会受到影
 msgid "Please change your password to secure your account again."
 msgstr "请修改您的密码,以保护您的账户安全。"
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "忘记密码?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "记住"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "登录"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "其他登录方式"
 
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 555d270359b76301c839d2c7b89f325e548622ae..54b373a24c854ab2d1484b585f39a2029dd79241 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:12+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+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"
@@ -77,15 +77,15 @@ msgstr "写入磁盘失败"
 msgid "Not enough storage available"
 msgstr "没有足够的存储空间"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "无效文件夹。"
 
@@ -93,36 +93,36 @@ msgstr "无效文件夹。"
 msgid "Files"
 msgstr "文件"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "没有足够可用空间"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "上传已取消"
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL不能为空"
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "错误"
 
@@ -134,7 +134,7 @@ msgstr "分享"
 msgid "Delete permanently"
 msgstr "永久删除"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "重命名"
 
@@ -166,12 +166,12 @@ msgstr "已将 {old_name}替换成 {new_name}"
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n 文件夹"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n个文件"
@@ -226,25 +226,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "下载正在准备中。如果文件较大可能会花费一些时间。"
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "名称"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "修改日期"
 
@@ -253,7 +253,7 @@ msgstr "修改日期"
 msgid "%s could not be renamed"
 msgstr "%s 不能被重命名"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "上传"
 
@@ -289,65 +289,65 @@ msgstr "ZIP 文件的最大输入大小"
 msgid "Save"
 msgstr "保存"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "新建"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "文本文件"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "文件夹"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "来自链接"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "已删除文件"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "取消上传"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "您没有写权限"
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "这里还什么都没有。上传些东西吧!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "下载"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "取消共享"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "删除"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "上传文件过大"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "您正尝试上传的文件超过了此服务器可以上传的最大容量限制"
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "文件正在被扫描,请稍候。"
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "当前扫描"
 
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index e61f96811edcaa6b453a6f85eb1f1643adef1ff9..c64e70f1ea4d3ccf43af787237cd72079dc6250b 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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,14 +56,14 @@ msgid ""
 "correct."
 msgstr "无法更新私钥密码。可能旧密码不正确。"
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -71,6 +71,18 @@ msgid ""
 "files."
 msgstr "您的私有密钥无效!也许是您在 ownCloud 系统外更改了密码 (比如,在您的公司目录)。您可以在个人设置里更新您的私钥密码来恢复访问你的加密文件。"
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -82,7 +94,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -98,91 +110,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "个人设置"
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "加密"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "启用恢复密钥(允许你在密码丢失后恢复文件):"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr "恢复密钥密码"
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "开启"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "禁用"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr "更改恢复密钥密码"
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr "旧的恢复密钥密码"
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr "新的恢复密钥密码"
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "修改密码"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr "您的私钥密码不再匹配您的登录密码:"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr "讲您旧的私钥密码改为当前登录密码。"
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "如果您记不住旧的密码,您可以请求管理员恢复您的文件。"
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "旧登录密码"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "当前登录密码"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr "更新私钥密码"
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr "启用密码恢复:"
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "启用该项将允许你在密码丢失后取回您的加密文件"
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "文件恢复设置已更新"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "不能更新文件恢复"
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 5887baf02b772940017e9cd9541265a1dfbb96d0..bcee07f59ba0a69639245ce887f9382f68f0d2bc 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
-"Last-Translator: waterone <suiy02@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "用户名或密码错误!请重试"
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "密码"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "提交"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "抱歉,此链接已失效"
@@ -54,28 +54,28 @@ msgstr "共享已禁用"
 msgid "For more info, please ask the person who sent this link."
 msgstr "欲知详情,请联系发给你链接的人。"
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s与您共享了%s文件夹"
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s与您共享了%s文件"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "下载"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "上传"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "取消上传"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "没有预览"
diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po
index b4b860b9760cd7b4d42b0b48014755885e57f7a0..47a77f55a4184ec0936ed4791a20f63c2c395dd2 100644
--- a/l10n/zh_CN/files_trashbin.po
+++ b/l10n/zh_CN/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: waterone <suiy02@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,40 +28,10 @@ msgstr "无法彻底删除文件%s"
 msgid "Couldn't restore %s"
 msgstr "无法恢复%s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "执行恢复操作"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "错误"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "彻底删除文件"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "永久删除"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "名称"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "已删除"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n 文件夹"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n个文件"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "已恢复"
@@ -70,11 +40,19 @@ msgstr "已恢复"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "这里没有东西. 你的回收站是空的!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "名称"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "恢复"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "已删除"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "删除"
 
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index fc1b3807b3d718c6326ee3f04bc897c320f2994d..d3df2b84ca71b13f0b0e73252109d67245b28a0a 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -369,14 +369,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
-msgstr "UUID属性:"
+msgid "UUID Attribute for Users:"
+msgstr ""
 
 #: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:105
 msgid "Username-LDAP User Mapping"
 msgstr "用户名-LDAP用户映射"
 
-#: templates/settings.php:105
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -390,18 +394,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr "清除用户-LDAP用户映射"
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "清除组用户-LDAP级映射"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "测试配置"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "帮助"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index 6847c841813ce34b4cea74816ddf4c1a3f0ccec1..a5d8b18d6f1e9ed7bf81580b69fd7cad2b50ba2c 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -56,45 +56,6 @@ msgstr ""
 msgid "... %d%% done ..."
 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 ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -306,27 +267,6 @@ msgstr ""
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-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:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "已分享"
@@ -335,7 +275,12 @@ msgstr "已分享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "錯誤"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "分享時發生錯誤"
 
@@ -367,7 +312,7 @@ msgstr "以連結分享"
 msgid "Password protect"
 msgstr "密碼保護"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "密碼"
 
@@ -439,30 +384,58 @@ msgstr "刪除"
 msgid "share"
 msgstr "分享"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "密碼保護"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "傳送中"
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "郵件已傳"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr ""
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "刪除"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "加入"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -499,7 +472,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "你將收到一封電郵"
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "用戶名稱"
 
@@ -543,7 +516,7 @@ msgstr "個人"
 msgid "Users"
 msgstr "用戶"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "軟件"
 
@@ -555,6 +528,34 @@ msgstr "管理"
 msgid "Help"
 msgstr "幫助"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -584,14 +585,6 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "加入"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -681,12 +674,12 @@ msgstr ""
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "登出"
 
@@ -704,19 +697,27 @@ msgstr "如果你近期未曾更改密碼, 你的帳號可能被洩露!"
 msgid "Please change your password to secure your account again."
 msgstr "請更改你的密碼以保護你的帳戶"
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "忘記密碼"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "記住"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "登入"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/zh_HK/files_encryption.po b/l10n/zh_HK/files_encryption.po
index eb5e9956658e8ca032dd9e2f7333c5985e59af19..65bf0507a6e38b70334d25a4bb3ac6e4ac3dfac7 100644
--- a/l10n/zh_HK/files_encryption.po
+++ b/l10n/zh_HK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -53,14 +53,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -68,6 +68,18 @@ msgid ""
 "files."
 msgstr ""
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -79,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -95,91 +107,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "加密"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po
index 51163c90a96fc9d5a74c504f1953cc33cc6e1a61..bdb1f33a77bd73d8e33faebb8f5fb48c76cf27a4 100644
--- a/l10n/zh_HK/files_sharing.po
+++ b/l10n/zh_HK/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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -18,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "密碼"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr ""
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
@@ -53,28 +53,28 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "下載"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "上傳"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/zh_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po
index ad4303aa9e4dc6f132e42f5be9761baf4d1e6fd7..a40b83f46b67ed612e3c92977c3976a2bffd1596 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,40 +27,10 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "錯誤"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr ""
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "名稱"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr ""
@@ -69,11 +39,19 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "名稱"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "刪除"
 
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index 794b71762b8f34b397561eeec62a2a1b941c0b20..504c7ca3785ed7d9a9f18dd9c141e786743d2c9d 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -368,14 +368,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "幫助"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index bf17c029d70b0f7164c3c13b5965eafc67d2ebb1..8d8a73d30e27cb94353465adc23cf947d6adce23 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 16:00+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:30+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"
@@ -58,45 +58,6 @@ msgstr "已更新檔案快取"
 msgid "... %d%% done ..."
 msgstr "已完成 %d%%"
 
-#: 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 "分類已經存在:%s"
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr "未指定物件類型"
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr "未提供 %s ID 。"
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr "加入 %s 到最愛時發生錯誤。"
-
-#: 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 "從最愛移除 %s 時發生錯誤。"
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "未提供圖片或檔案"
@@ -308,27 +269,6 @@ msgstr "(已選 {count} 項)"
 msgid "Error loading file exists template"
 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:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
-#: js/share.js:665 js/share.js:677
-msgid "Error"
-msgstr "錯誤"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr "沒有指定 app 名稱。"
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr "沒有安裝所需的檔案 {file} !"
-
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
 msgstr "已分享"
@@ -337,7 +277,12 @@ msgstr "已分享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:132 js/share.js:705
+#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
+#: js/share.js:679
+msgid "Error"
+msgstr "錯誤"
+
+#: js/share.js:132 js/share.js:707
 msgid "Error while sharing"
 msgstr "分享時發生錯誤"
 
@@ -369,7 +314,7 @@ msgstr "使用連結分享"
 msgid "Password protect"
 msgstr "密碼保護"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "密碼"
 
@@ -441,30 +386,58 @@ msgstr "刪除"
 msgid "share"
 msgstr "分享"
 
-#: js/share.js:409 js/share.js:652
+#: js/share.js:409 js/share.js:654
 msgid "Password protected"
 msgstr "受密碼保護"
 
-#: js/share.js:665
+#: js/share.js:667
 msgid "Error unsetting expiration date"
 msgstr "取消到期日設定失敗"
 
-#: js/share.js:677
+#: js/share.js:679
 msgid "Error setting expiration date"
 msgstr "設定到期日發生錯誤"
 
-#: js/share.js:692
+#: js/share.js:694
 msgid "Sending ..."
 msgstr "正在傳送…"
 
-#: js/share.js:703
+#: js/share.js:705
 msgid "Email sent"
 msgstr "Email 已寄出"
 
-#: js/share.js:727
+#: js/share.js:729
 msgid "Warning"
 msgstr "警告"
 
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr "未指定物件類型。"
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "刪除"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "增加"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -501,7 +474,7 @@ msgid "You will receive a link to reset your password via Email."
 msgstr "重設密碼的連結將會寄到您的電子郵件信箱。"
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: templates/login.php:25
 msgid "Username"
 msgstr "使用者名稱"
 
@@ -545,7 +518,7 @@ msgstr "個人"
 msgid "Users"
 msgstr "使用者"
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:109
 msgid "Apps"
 msgstr "應用程式"
 
@@ -557,6 +530,34 @@ msgstr "管理"
 msgid "Help"
 msgstr "說明"
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr "存取被拒"
@@ -586,14 +587,6 @@ msgstr "分享將於 %s 過期\n"
 msgid "Cheers!"
 msgstr "太棒了!"
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "編輯分類"
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "增加"
-
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
@@ -683,12 +676,12 @@ msgstr "完成設定"
 msgid "Finishing …"
 msgstr "即將完成…"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:42
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s 已經釋出,瞭解更多資訊以進行更新。"
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:70
 msgid "Log out"
 msgstr "登出"
 
@@ -706,19 +699,27 @@ msgstr "如果您最近並未更改密碼,您的帳號可能已經遭到入侵
 msgid "Please change your password to secure your account again."
 msgstr "請更改您的密碼以再次取得您帳戶的控制權。"
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
 msgid "Lost your password?"
 msgstr "忘記密碼?"
 
-#: templates/login.php:37
+#: templates/login.php:43
 msgid "remember"
 msgstr "記住"
 
-#: templates/login.php:40
+#: templates/login.php:46
 msgid "Log in"
 msgstr "登入"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Alternative Logins"
 msgstr "其他登入方法"
 
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index f75d7a8e4c1379d68d107855bff0b4c0ecbfd891..e58163eea680de38b975edbbb0a15c012d5f9217 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 15:40+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-11 02:31+0000\n"
 "Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -75,15 +75,15 @@ msgstr "寫入硬碟失敗"
 msgid "Not enough storage available"
 msgstr "儲存空間不足"
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:122 ajax/upload.php:148
 msgid "Upload failed. Could not get file info."
 msgstr "上傳失敗,無法取得檔案資訊"
 
-#: ajax/upload.php:136
+#: ajax/upload.php:138
 msgid "Upload failed. Could not find uploaded file"
 msgstr "上傳失敗,找不到上傳的檔案"
 
-#: ajax/upload.php:160
+#: ajax/upload.php:165
 msgid "Invalid directory."
 msgstr "無效的資料夾"
 
@@ -91,36 +91,36 @@ msgstr "無效的資料夾"
 msgid "Files"
 msgstr "檔案"
 
-#: js/file-upload.js:244
+#: js/file-upload.js:224
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "因為 {filename} 是個目錄或是大小為零,所以無法上傳"
 
-#: js/file-upload.js:255
+#: js/file-upload.js:235
 msgid "Not enough space available"
 msgstr "沒有足夠的可用空間"
 
-#: js/file-upload.js:322
+#: js/file-upload.js:302
 msgid "Upload cancelled."
 msgstr "上傳已取消"
 
-#: js/file-upload.js:356
+#: js/file-upload.js:336
 msgid "Could not get result from server."
 msgstr "無法從伺服器取回結果"
 
-#: js/file-upload.js:446
+#: js/file-upload.js:426
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "檔案上傳中,離開此頁面將會取消上傳。"
 
-#: js/file-upload.js:520
+#: js/file-upload.js:500
 msgid "URL cannot be empty."
 msgstr "URL 不能為空"
 
-#: js/file-upload.js:525 lib/app.php:53
+#: js/file-upload.js:505 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "無效的資料夾名稱,'Shared' 的使用被 ownCloud 保留"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
+#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
 msgid "Error"
 msgstr "錯誤"
 
@@ -132,7 +132,7 @@ msgstr "分享"
 msgid "Delete permanently"
 msgstr "永久刪除"
 
-#: js/fileactions.js:197
+#: js/fileactions.js:184
 msgid "Rename"
 msgstr "重新命名"
 
@@ -164,12 +164,12 @@ msgstr "使用 {new_name} 取代 {old_name}"
 msgid "undo"
 msgstr "復原"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n 個資料夾"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n 個檔案"
@@ -224,25 +224,25 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "加密已經被停用,但是您的舊檔案還是處於已加密的狀態,請前往個人設定以解密這些檔案。"
 
-#: js/files.js:305
+#: js/files.js:307
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "正在準備您的下載,若您的檔案較大,將會需要更多時間。"
 
-#: js/files.js:516 js/files.js:554
+#: js/files.js:518 js/files.js:556
 msgid "Error moving file"
 msgstr "移動檔案失敗"
 
-#: js/files.js:567 templates/index.php:59
+#: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "名稱"
 
-#: js/files.js:568 templates/index.php:71
+#: js/files.js:570 templates/index.php:68
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:569 templates/index.php:73
+#: js/files.js:571 templates/index.php:70
 msgid "Modified"
 msgstr "修改時間"
 
@@ -251,7 +251,7 @@ msgstr "修改時間"
 msgid "%s could not be renamed"
 msgstr "無法重新命名 %s"
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr "上傳"
 
@@ -287,65 +287,65 @@ msgstr "ZIP 壓縮前的原始大小限制"
 msgid "Save"
 msgstr "儲存"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "新增"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "Text file"
 msgstr "文字檔"
 
-#: templates/index.php:11
+#: templates/index.php:10
 msgid "Folder"
 msgstr "資料夾"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr "從連結"
 
-#: templates/index.php:32
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr "回收桶"
 
-#: templates/index.php:37
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr "取消上傳"
 
-#: templates/index.php:43
+#: templates/index.php:40
 msgid "You don’t have write permissions here."
 msgstr "您在這裡沒有編輯權"
 
-#: templates/index.php:48
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr "這裡還沒有東西,上傳一些吧!"
 
-#: templates/index.php:65
+#: templates/index.php:62
 msgid "Download"
 msgstr "下載"
 
-#: templates/index.php:78 templates/index.php:79
+#: templates/index.php:75 templates/index.php:76
 msgid "Unshare"
 msgstr "取消分享"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:81 templates/index.php:82
 msgid "Delete"
 msgstr "刪除"
 
-#: templates/index.php:98
+#: templates/index.php:95
 msgid "Upload too large"
 msgstr "上傳過大"
 
-#: templates/index.php:100
+#: templates/index.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "您試圖上傳的檔案大小超過伺服器的限制。"
 
-#: templates/index.php:105
+#: templates/index.php:102
 msgid "Files are being scanned, please wait."
 msgstr "正在掃描檔案,請稍等。"
 
-#: templates/index.php:108
+#: templates/index.php:105
 msgid "Current scanning"
 msgstr "正在掃描"
 
diff --git a/l10n/zh_TW/files_encryption.po b/l10n/zh_TW/files_encryption.po
index 021e5775dc2719e1540d1de59b3f7d31bc5f1fac..7d7eca8533c1e8d5db6cb20da9ca7d6cb907bf99 100644
--- a/l10n/zh_TW/files_encryption.po
+++ b/l10n/zh_TW/files_encryption.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-06 23:07+0000\n"
+"POT-Creation-Date: 2013-10-13 20:29-0400\n"
+"PO-Revision-Date: 2013-10-14 00:29+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"
@@ -55,14 +55,14 @@ msgid ""
 "correct."
 msgstr ""
 
-#: files/error.php:9
+#: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr ""
 
-#: files/error.php:12
+#: files/error.php:15
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -70,6 +70,18 @@ msgid ""
 "files."
 msgstr "您的私鑰不正確! 感覺像是密碼在 ownCloud 系統之外被改變(例:您的目錄)。 您可以在個人設定中更新私鑰密碼取回已加密的檔案。"
 
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
 #: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
@@ -81,7 +93,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:254
+#: hooks/hooks.php:252
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -97,91 +109,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr "加密"
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:17
+#: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr "已啓用"
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr "已停用"
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:34
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr "變更密碼"
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "如果您忘記舊密碼,可以請求管理員協助取回檔案。"
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr "舊登入密碼"
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr "目前的登入密碼"
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr "檔案還原設定已更新"
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr "無法更新檔案還原設定"
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index c59207bb90f5153f16dd173ed0198a244f376717..e9f5758538f9a1696acd272887369352d08a0f99 100644
--- a/l10n/zh_TW/files_sharing.po
+++ b/l10n/zh_TW/files_sharing.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-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:26+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"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
 msgstr "請檢查您的密碼並再試一次"
 
-#: templates/authenticate.php:7
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr "密碼"
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "送出"
-
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr "抱歉,此連結已經失效"
@@ -54,28 +54,28 @@ msgstr "分享功能已停用"
 msgid "For more info, please ask the person who sent this link."
 msgstr "請詢問告訴您此連結的人以瞭解更多"
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s 和您分享了資料夾 %s "
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s 和您分享了檔案 %s"
 
-#: templates/public.php:26 templates/public.php:92
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "下載"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr "上傳"
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr "取消上傳"
 
-#: templates/public.php:89
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr "無法預覽"
diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po
index 645968ec0b5a7a80d676b6a2c8f2d5476503c3e4..c5eb5e0a270ded45d3c4eb6eb4278e9cb6d96bb4 100644
--- a/l10n/zh_TW/files_trashbin.po
+++ b/l10n/zh_TW/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -28,40 +28,10 @@ msgstr "無法永久刪除 %s"
 msgid "Couldn't restore %s"
 msgstr "無法還原 %s"
 
-#: js/trash.js:7 js/trash.js:102
-msgid "perform restore operation"
-msgstr "進行還原動作"
-
-#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr "錯誤"
 
-#: js/trash.js:37
-msgid "delete file permanently"
-msgstr "永久刪除檔案"
-
-#: js/trash.js:129
-msgid "Delete permanently"
-msgstr "永久刪除"
-
-#: js/trash.js:190 templates/index.php:21
-msgid "Name"
-msgstr "名稱"
-
-#: js/trash.js:191 templates/index.php:31
-msgid "Deleted"
-msgstr "已刪除"
-
-#: js/trash.js:199
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n 個資料夾"
-
-#: js/trash.js:205
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n 個檔案"
-
 #: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "已還原"
@@ -70,11 +40,19 @@ msgstr "已還原"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "您的回收桶是空的!"
 
-#: templates/index.php:24 templates/index.php:26
+#: templates/index.php:23
+msgid "Name"
+msgstr "名稱"
+
+#: templates/index.php:26 templates/index.php:28
 msgid "Restore"
 msgstr "還原"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:34
+msgid "Deleted"
+msgstr "已刪除"
+
+#: templates/index.php:37 templates/index.php:38
 msgid "Delete"
 msgstr "刪除"
 
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index c33ca060231ad923375129ede3ae2eed0d12ad80..8f5867a1ca13cf70bd188c3d6e30681403ee9104 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 12:22+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-10-10 22:26-0400\n"
+"PO-Revision-Date: 2013-10-11 02:27+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"
@@ -370,14 +370,18 @@ msgid ""
 msgstr ""
 
 #: templates/settings.php:103
-msgid "UUID Attribute:"
+msgid "UUID Attribute for Users:"
 msgstr ""
 
 #: templates/settings.php:104
-msgid "Username-LDAP User Mapping"
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
 #: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -391,18 +395,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:107
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Test Configuration"
 msgstr "測試此設定"
 
-#: templates/settings.php:108
+#: templates/settings.php:109
 msgid "Help"
 msgstr "說明"
diff --git a/lib/base.php b/lib/base.php
index b0b2dca502f80477b02f055c03ed0f897c4a1e8f..9068fe7698177fcd40f9902b5fb3a7f3ac9d86d1 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -304,9 +304,8 @@ class OC {
 			self::$session = new \OC\Session\Internal(OC_Util::getInstanceId());
 			// if session cant be started break with http 500 error
 		} catch (Exception $e) {
-			OC_Log::write('core', 'Session could not be initialized',
+			OC_Log::write('core', 'Session could not be initialized. Exception message: '.$e->getMessage(),
 				OC_Log::ERROR);
-
 			header('HTTP/1.1 500 Internal Server Error');
 			OC_Util::addStyle("styles");
 			$error = 'Session could not be initialized. Please contact your ';
@@ -760,6 +759,13 @@ class OC {
 		// logon via web form
 		elseif (OC::tryFormLogin()) {
 			$error[] = 'invalidpassword';
+			if ( OC_Config::getValue('log_authfailip', false) ) {
+				OC_Log::write('core', 'Login failed: user \''.$_POST["user"].'\' , wrong password, IP:'.$_SERVER['REMOTE_ADDR'],
+				OC_Log::WARN);
+			} else { 
+				OC_Log::write('core', 'Login failed: user \''.$_POST["user"].'\' , wrong password, IP:set log_authfailip=true in conf',
+                                OC_Log::WARN);
+			}
 		}
 
 		OC_Util::displayLoginPage(array_unique($error));
diff --git a/lib/l10n/ady.php b/lib/l10n/ady.php
new file mode 100644
index 0000000000000000000000000000000000000000..15f78e0bce6d7e36688d2913f6affa4c17472a65
--- /dev/null
+++ b/lib/l10n/ady.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/mk.php b/lib/l10n/mk.php
index 285dfd682a4588de7fd9009af568ceb2274897e6..19e36c868d0a463ac0ff73934d8db0bc56da0dda 100644
--- a/lib/l10n/mk.php
+++ b/lib/l10n/mk.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Settings" => "Подесувања",
 "Users" => "Корисници",
 "Admin" => "Админ",
+"Invalid image" => "Невалидна фотографија",
 "web services under your control" => "веб сервиси под Ваша контрола",
 "ZIP download is turned off." => "Преземање во ZIP е исклучено",
 "Files need to be downloaded one by one." => "Датотеките треба да се симнат една по една.",
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index bc298a3f33f51f5cf064ec3316fdbf7dcb21a535..cb990aed11065e9a234b7a68e13ef9a656b635b8 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "A aplicação \"%s\" não pode ser instaladas por não ser compatível com esta versão da ownCloud.",
+"No app name specified" => "O nome da aplicação não foi especificado",
 "Help" => "Ajuda",
 "Personal" => "Pessoal",
 "Settings" => "Configurações",
@@ -15,6 +17,11 @@ $TRANSLATIONS = array(
 "Back to Files" => "Voltar a Ficheiros",
 "Selected files too large to generate zip file." => "Os ficheiros seleccionados são grandes demais para gerar um ficheiro zip.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descarregue os ficheiros em partes menores, separados ou peça gentilmente ao seu administrador.",
+"Archives of type %s are not supported" => "Arquivos do tipo %s não são suportados",
+"App does not provide an info.xml file" => "A aplicação não disponibiliza um ficheiro info.xml",
+"App can't be installed because of not allowed code in the App" => "A aplicação não pode ser instalado devido a código não permitido dentro da aplicação",
+"App directory already exists" => "A directoria da aplicação já existe",
+"Can't create app folder. Please fix permissions. %s" => "Não foi possível criar a pasta da aplicação. Por favor verifique as permissões. %s",
 "Application is not enabled" => "A aplicação não está activada",
 "Authentication error" => "Erro na autenticação",
 "Token expired. Please reload page." => "O token expirou. Por favor recarregue a página.",
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
index 37f2e1d8c08737968cf9f21babf20c714407cbe1..8ce6d005ca42cb86ce9e52108e876449df0fbd2a 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -8,6 +8,9 @@ $TRANSLATIONS = array(
 "Users" => "Användare",
 "Admin" => "Admin",
 "Failed to upgrade \"%s\"." => "Misslyckades med att uppgradera \"%s\".",
+"Custom profile pictures don't work with encryption yet" => "Anpassningsbara profilbilder fungerar inte med kryptering ännu.",
+"Unknown filetype" => "Okänd filtyp",
+"Invalid image" => "Ogiltig bild",
 "web services under your control" => "webbtjänster under din kontroll",
 "cannot open \"%s\"" => "Kan inte öppna \"%s\"",
 "ZIP download is turned off." => "Nerladdning av ZIP är avstängd.",
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
index 01f48517aeca3edb3942212e38948d2d0a2192c9..80288ed0516e664091620c980510bcb3efaabbea 100644
--- a/lib/l10n/tr.php
+++ b/lib/l10n/tr.php
@@ -8,6 +8,9 @@ $TRANSLATIONS = array(
 "Users" => "Kullanıcılar",
 "Admin" => "Yönetici",
 "Failed to upgrade \"%s\"." => "\"%s\" yükseltme başarısız oldu.",
+"Custom profile pictures don't work with encryption yet" => "Hala özel profil resminiz şifreleme ile çalışmıyor",
+"Unknown filetype" => "Bilinmeyen dosya türü",
+"Invalid image" => "Geçersiz resim",
 "web services under your control" => "Bilgileriniz güvenli ve şifreli",
 "cannot open \"%s\"" => "\"%s\" açılamıyor",
 "ZIP download is turned off." => "ZIP indirmeleri kapatılmıştır.",
diff --git a/lib/private/app.php b/lib/private/app.php
index 0ab1ee57f631654cffcde66de4040b78ac23550e..b4a719921788689d6bc32e2c489620d25edcdb82 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -165,10 +165,14 @@ class OC_App{
 	/**
 	 * get all enabled apps
 	 */
+	private static $enabledAppsCache = array();
 	public static function getEnabledApps() {
 		if(!OC_Config::getValue('installed', false)) {
 			return array();
 		}
+		if(!empty(self::$enabledAppsCache)) {
+			return self::$enabledAppsCache;
+		}
 		$apps=array('files');
 		$sql = 'SELECT `appid` FROM `*PREFIX*appconfig`'
 			.' WHERE `configkey` = \'enabled\' AND `configvalue`=\'yes\'';
@@ -187,6 +191,7 @@ class OC_App{
 				$apps[]=$row['appid'];
 			}
 		}
+		self::$enabledAppsCache = $apps;
 		return $apps;
 	}
 
@@ -198,11 +203,11 @@ class OC_App{
 	 * This function checks whether or not an app is enabled.
 	 */
 	public static function isEnabled( $app ) {
-		if( 'files'==$app or ('yes' == OC_Appconfig::getValue( $app, 'enabled' ))) {
+		if('files' == $app) {
 			return true;
 		}
-
-		return false;
+		$enabledApps = self::getEnabledApps();
+		return in_array($app, $enabledApps);
 	}
 
 	/**
@@ -214,6 +219,7 @@ class OC_App{
 	 * This function set an app as enabled in appconfig.
 	 */
 	public static function enable( $app ) {
+		self::$enabledAppsCache = array(); // flush
 		if(!OC_Installer::isInstalled($app)) {
 			// check if app is a shipped app or not. OCS apps have an integer as id, shipped apps use a string
 			if(!is_numeric($app)) {
@@ -257,6 +263,7 @@ class OC_App{
 	 * This function set an app as disabled in appconfig.
 	 */
 	public static function disable( $app ) {
+		self::$enabledAppsCache = array(); // flush
 		// check if app is a shipped app or not. if not delete
 		\OC_Hook::emit('OC_App', 'pre_disable', array('app' => $app));
 		OC_Appconfig::setValue( $app, 'enabled', 'no' );
diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php
index 3755d45fa092dd1b44f8dfc62f9f3eafee23c536..e62b72fd9734286c8ae1e07aa1e58f4819ca0010 100644
--- a/lib/private/appframework/dependencyinjection/dicontainer.php
+++ b/lib/private/appframework/dependencyinjection/dicontainer.php
@@ -89,11 +89,12 @@ class DIContainer extends SimpleContainer implements IAppContainer{
 			return new SecurityMiddleware($c['API'], $c['Request']);
 		});
 
-		$this['MiddlewareDispatcher'] = $this->share(function($c){
+        $middleWares = $this->middleWares;
+		$this['MiddlewareDispatcher'] = $this->share(function($c) use ($middleWares) {
 			$dispatcher = new MiddlewareDispatcher();
 			$dispatcher->registerMiddleware($c['SecurityMiddleware']);
 
-			foreach($this->middleWares as $middleWare) {
+			foreach($middleWares as $middleWare) {
 				$dispatcher->registerMiddleware($middleWare);
 			}
 
diff --git a/lib/private/connector/sabre/directory.php b/lib/private/connector/sabre/directory.php
index 531b0a807bf4930efa2abc1ed24474b7837c0729..c51f84bf67c7ece5f9c6bf58ba1a8653f7881463 100644
--- a/lib/private/connector/sabre/directory.php
+++ b/lib/private/connector/sabre/directory.php
@@ -50,8 +50,22 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	 */
 	public function createFile($name, $data = null) {
 
-		if (!\OC\Files\Filesystem::isCreatable($this->path)) {
-			throw new \Sabre_DAV_Exception_Forbidden();
+		// for chunked upload also updating a existing file is a "createFile"
+		// because we create all the chunks before reasamble them to the existing file.
+		if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
+
+			// exit if we can't create a new file and we don't updatable existing file
+			$info = OC_FileChunking::decodeName($name);
+			if (!\OC\Files\Filesystem::isCreatable($this->path) &&
+					!\OC\Files\Filesystem::isUpdatable($this->path . '/' . $info['name'])) {
+				throw new \Sabre_DAV_Exception_Forbidden();
+			}
+
+		} else {
+			// For non-chunked upload it is enough to check if we can create a new file
+			if (!\OC\Files\Filesystem::isCreatable($this->path)) {
+				throw new \Sabre_DAV_Exception_Forbidden();
+			}
 		}
 
 		$path = $this->path . '/' . $name;
diff --git a/lib/private/connector/sabre/exception/entitytoolarge.php b/lib/private/connector/sabre/exception/entitytoolarge.php
new file mode 100644
index 0000000000000000000000000000000000000000..2bda51f2f3ee5f418575a9a3c82170b3c44312cf
--- /dev/null
+++ b/lib/private/connector/sabre/exception/entitytoolarge.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Entity Too Large
+ *
+ * This exception is thrown whenever a user tries to upload a file which exceeds hard limitations
+ *
+ */
+class OC_Connector_Sabre_Exception_EntityTooLarge extends Sabre_DAV_Exception {
+
+	/**
+	 * Returns the HTTP status code for this exception
+	 *
+	 * @return int
+	 */
+	public function getHTTPCode() {
+
+		return 413;
+
+	}
+
+}
diff --git a/lib/private/connector/sabre/exception/unsupportedmediatype.php b/lib/private/connector/sabre/exception/unsupportedmediatype.php
new file mode 100644
index 0000000000000000000000000000000000000000..95d6a8cc651f6423b3ecc770d37648180e0c2bf0
--- /dev/null
+++ b/lib/private/connector/sabre/exception/unsupportedmediatype.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Unsupported Media Type
+ *
+ * This exception is thrown whenever a user tries to upload a file which holds content which is not allowed
+ *
+ */
+class OC_Connector_Sabre_Exception_UnsupportedMediaType extends Sabre_DAV_Exception {
+
+	/**
+	 * Returns the HTTP status code for this exception
+	 *
+	 * @return int
+	 */
+	public function getHTTPCode() {
+
+		return 415;
+
+	}
+
+}
diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index f2191732c0de26cb8d0390304963566d9b36a319..3402946a136b867df5550df582ae8505382c5560 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -45,7 +45,9 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 	 * @return string|null
 	 */
 	public function put($data) {
+
 		$fs = $this->getFS();
+
 		if ($fs->file_exists($this->path) &&
 			!$fs->isUpdatable($this->path)) {
 			throw new \Sabre_DAV_Exception_Forbidden();
@@ -64,6 +66,13 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 		// mark file as partial while uploading (ignored by the scanner)
 		$partpath = $this->path . '.part';
 
+		// if file is located in /Shared we write the part file to the users
+		// root folder because we can't create new files in /shared
+		// we extend the name with a random number to avoid overwriting a existing file
+		if (dirname($partpath) === 'Shared') {
+			$partpath = pathinfo($partpath, PATHINFO_FILENAME) . rand() . '.part';
+		}
+
 		try {
 			$putOkay = $fs->file_put_contents($partpath, $data);
 			if ($putOkay === false) {
@@ -73,7 +82,21 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 				throw new Sabre_DAV_Exception();
 			}
 		} catch (\OCP\Files\NotPermittedException $e) {
-			throw new Sabre_DAV_Exception_Forbidden();
+			// a more general case - due to whatever reason the content could not be written
+			throw new Sabre_DAV_Exception_Forbidden($e->getMessage());
+
+		} catch (\OCP\Files\EntityTooLargeException $e) {
+			// the file is too big to be stored
+			throw new OC_Connector_Sabre_Exception_EntityTooLarge($e->getMessage());
+
+		} catch (\OCP\Files\InvalidContentException $e) {
+			// the file content is not permitted
+			throw new OC_Connector_Sabre_Exception_UnsupportedMediaType($e->getMessage());
+
+		} catch (\OCP\Files\InvalidPathException $e) {
+			// the path for the file was not valid
+			// TODO: find proper http status code for this case
+			throw new Sabre_DAV_Exception_Forbidden($e->getMessage());
 		}
 
 		// rename to correct path
diff --git a/lib/private/connector/sabre/node.php b/lib/private/connector/sabre/node.php
index fa27abb381ab48297b65dcaae36a33537afdad14..c38e9f86375f1f8be7c2052111d751f9187582be 100644
--- a/lib/private/connector/sabre/node.php
+++ b/lib/private/connector/sabre/node.php
@@ -147,12 +147,6 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	 *  Even if the modification time is set to a custom value the access time is set to now.
 	 */
 	public function touch($mtime) {
-
-		// touch is only allowed if the update privilege is granted
-		if (!\OC\Files\Filesystem::isUpdatable($this->path)) {
-			throw new \Sabre_DAV_Exception_Forbidden();
-		}
-
 		\OC\Files\Filesystem::touch($this->path, $mtime);
 	}
 
diff --git a/lib/private/connector/sabre/objecttree.php b/lib/private/connector/sabre/objecttree.php
index 80c3840b99d9fa95bd34bc7a4625a124b54e9cc0..df8902f66e2566a7e203949d235d4f9d2bcd72b2 100644
--- a/lib/private/connector/sabre/objecttree.php
+++ b/lib/private/connector/sabre/objecttree.php
@@ -87,6 +87,9 @@ class ObjectTree extends \Sabre_DAV_ObjectTree {
 			if (!$fs->isUpdatable($destinationDir)) {
 				throw new \Sabre_DAV_Exception_Forbidden();
 			}
+			if (!$fs->isDeletable($sourcePath)) {
+				throw new \Sabre_DAV_Exception_Forbidden();
+			}
 		}
 
 		$renameOkay = $fs->rename($sourcePath, $destinationPath);
diff --git a/lib/private/files/storage/storage.php b/lib/private/files/storage/storage.php
index b673bb9a32d0dd5ff624cb87a7a83807cf7d700a..5be90f24756d10aea7bb376c4c192b71c665e509 100644
--- a/lib/private/files/storage/storage.php
+++ b/lib/private/files/storage/storage.php
@@ -14,278 +14,6 @@ namespace OC\Files\Storage;
  * All paths passed to the storage are relative to the storage and should NOT have a leading slash.
  */
 interface Storage extends \OCP\Files\Storage {
-	/**
-	 * $parameters is a free form array with the configuration options needed to construct the storage
-	 *
-	 * @param array $parameters
-	 */
-	public function __construct($parameters);
-
-	/**
-	 * Get the identifier for the storage,
-	 * the returned id should be the same for every storage object that is created with the same parameters
-	 * and two storage objects with the same id should refer to two storages that display the same files.
-	 *
-	 * @return string
-	 */
-	public function getId();
-
-	/**
-	 * see http://php.net/manual/en/function.mkdir.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function mkdir($path);
-
-	/**
-	 * see http://php.net/manual/en/function.rmdir.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function rmdir($path);
-
-	/**
-	 * see http://php.net/manual/en/function.opendir.php
-	 *
-	 * @param string $path
-	 * @return resource
-	 */
-	public function opendir($path);
-
-	/**
-	 * see http://php.net/manual/en/function.is_dir.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function is_dir($path);
-
-	/**
-	 * see http://php.net/manual/en/function.is_file.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function is_file($path);
-
-	/**
-	 * see http://php.net/manual/en/function.stat.php
-	 * only the following keys are required in the result: size and mtime
-	 *
-	 * @param string $path
-	 * @return array
-	 */
-	public function stat($path);
-
-	/**
-	 * see http://php.net/manual/en/function.filetype.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function filetype($path);
-
-	/**
-	 * see http://php.net/manual/en/function.filesize.php
-	 * The result for filesize when called on a folder is required to be 0
-	 *
-	 * @param string $path
-	 * @return int
-	 */
-	public function filesize($path);
-
-	/**
-	 * check if a file can be created in $path
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isCreatable($path);
-
-	/**
-	 * check if a file can be read
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isReadable($path);
-
-	/**
-	 * check if a file can be written to
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isUpdatable($path);
-
-	/**
-	 * check if a file can be deleted
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isDeletable($path);
-
-	/**
-	 * check if a file can be shared
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isSharable($path);
-
-	/**
-	 * get the full permissions of a path.
-	 * Should return a combination of the PERMISSION_ constants defined in lib/public/constants.php
-	 *
-	 * @param string $path
-	 * @return int
-	 */
-	public function getPermissions($path);
-
-	/**
-	 * see http://php.net/manual/en/function.file_exists.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function file_exists($path);
-
-	/**
-	 * see http://php.net/manual/en/function.filemtime.php
-	 *
-	 * @param string $path
-	 * @return int
-	 */
-	public function filemtime($path);
-
-	/**
-	 * see http://php.net/manual/en/function.file_get_contents.php
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function file_get_contents($path);
-
-	/**
-	 * see http://php.net/manual/en/function.file_put_contents.php
-	 *
-	 * @param string $path
-	 * @param string $data
-	 * @return bool
-	 */
-	public function file_put_contents($path, $data);
-
-	/**
-	 * see http://php.net/manual/en/function.unlink.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function unlink($path);
-
-	/**
-	 * see http://php.net/manual/en/function.rename.php
-	 *
-	 * @param string $path1
-	 * @param string $path2
-	 * @return bool
-	 */
-	public function rename($path1, $path2);
-
-	/**
-	 * see http://php.net/manual/en/function.copy.php
-	 *
-	 * @param string $path1
-	 * @param string $path2
-	 * @return bool
-	 */
-	public function copy($path1, $path2);
-
-	/**
-	 * see http://php.net/manual/en/function.fopen.php
-	 *
-	 * @param string $path
-	 * @param string $mode
-	 * @return resource
-	 */
-	public function fopen($path, $mode);
-
-	/**
-	 * get the mimetype for a file or folder
-	 * The mimetype for a folder is required to be "httpd/unix-directory"
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function getMimeType($path);
-
-	/**
-	 * see http://php.net/manual/en/function.hash.php
-	 *
-	 * @param string $type
-	 * @param string $path
-	 * @param bool $raw
-	 * @return string
-	 */
-	public function hash($type, $path, $raw = false);
-
-	/**
-	 * see http://php.net/manual/en/function.free_space.php
-	 *
-	 * @param string $path
-	 * @return int
-	 */
-	public function free_space($path);
-
-	/**
-	 * search for occurrences of $query in file names
-	 *
-	 * @param string $query
-	 * @return array
-	 */
-	public function search($query);
-
-	/**
-	 * see http://php.net/manual/en/function.touch.php
-	 * If the backend does not support the operation, false should be returned
-	 *
-	 * @param string $path
-	 * @param int $mtime
-	 * @return bool
-	 */
-	public function touch($path, $mtime = null);
-
-	/**
-	 * get the path to a local version of the file.
-	 * The local version of the file can be temporary and doesn't have to be persistent across requests
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function getLocalFile($path);
-
-	/**
-	 * get the path to a local version of the folder.
-	 * The local version of the folder can be temporary and doesn't have to be persistent across requests
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function getLocalFolder($path);
-	/**
-	 * check if a file or folder has been updated since $time
-	 *
-	 * @param string $path
-	 * @param int $time
-	 * @return bool
-	 *
-	 * hasUpdated for folders should return at least true if a file inside the folder is add, removed or renamed.
-	 * returning true for other changes in the folder is optional
-	 */
-	public function hasUpdated($path, $time);
 
 	/**
 	 * get a cache instance for the storage
@@ -333,11 +61,4 @@ interface Storage extends \OCP\Files\Storage {
 	 */
 	public function getStorageCache();
 
-	/**
-	 * get the ETag for a file or folder
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function getETag($path);
 }
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index aa08a5f7cc9f2ad48ec756068283281850ff6d22..a56135d9b3cafe8589dcf85f86ea88dfab957018 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -110,7 +110,9 @@ class View {
 	 * @return array consisting of the storage and the internal path
 	 */
 	public function resolvePath($path) {
-		return Filesystem::resolvePath($this->getAbsolutePath($path));
+		$a = $this->getAbsolutePath($path);
+		$p = Filesystem::normalizePath($a);
+		return Filesystem::resolvePath($p);
 	}
 
 	/**
@@ -324,7 +326,8 @@ class View {
 				return false;
 			}
 		} else {
-			return $this->basicOperation('file_put_contents', $path, array('create', 'write'), $data);
+			$hooks = ($this->file_exists($path)) ? array('write') : array('create', 'write');
+			return $this->basicOperation('file_put_contents', $path, $hooks, $data);
 		}
 	}
 
@@ -709,7 +712,10 @@ class View {
 			return false;
 		}
 		$defaultRoot = Filesystem::getRoot();
-		return (strlen($this->fakeRoot) >= strlen($defaultRoot)) && (substr($this->fakeRoot, 0, strlen($defaultRoot)) === $defaultRoot);
+		if($this->fakeRoot === $defaultRoot){
+			return true;
+		}
+		return (strlen($this->fakeRoot) > strlen($defaultRoot)) && (substr($this->fakeRoot, 0, strlen($defaultRoot) + 1) === $defaultRoot . '/');
 	}
 
 	private function runHooks($hooks, $path, $post = false) {
diff --git a/lib/private/group.php b/lib/private/group.php
index ba93dc129a11f09c3972446246af9f94f235ca3d..9144ef683b6129cbab6bcca85923eb93a38dbff2 100644
--- a/lib/private/group.php
+++ b/lib/private/group.php
@@ -265,7 +265,7 @@ class OC_Group {
 	public static function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
 		$group = self::getManager()->get($gid);
 		if ($group) {
-			$users = $group->searchDisplayName($search . $limit, $offset);
+			$users = $group->searchDisplayName($search, $limit, $offset);
 			$displayNames = array();
 			foreach ($users as $user) {
 				$displayNames[] = $user->getDisplayName();
diff --git a/lib/private/legacy/config.php b/lib/private/legacy/config.php
index 7e4980137377baadc8959bd1fe2a8326a753b752..c457979113e9ccd25d13f11560520273b9e0444f 100644
--- a/lib/private/legacy/config.php
+++ b/lib/private/legacy/config.php
@@ -83,11 +83,7 @@ class OC_Config {
 	 *
 	 */
 	public static function setValue($key, $value) {
-		try {
-			self::$object->setValue($key, $value);
-		} catch (\OC\HintException $e) {
-			\OC_Template::printErrorPage($e->getMessage(), $e->getHint());
-		}
+		self::$object->setValue($key, $value);
 	}
 
 	/**
@@ -98,10 +94,6 @@ class OC_Config {
 	 *
 	 */
 	public static function deleteKey($key) {
-		try {
-			self::$object->deleteKey($key);
-		} catch (\OC\HintException $e) {
-			\OC_Template::printErrorPage($e->getMessage(), $e->getHint());
-		}
+		self::$object->deleteKey($key);
 	}
 }
diff --git a/lib/private/log/owncloud.php b/lib/private/log/owncloud.php
index d16b9537a1658ca4f9835494e2d9265433dd0b41..a408e3830d6da34987c465373bddce263889705d 100644
--- a/lib/private/log/owncloud.php
+++ b/lib/private/log/owncloud.php
@@ -51,12 +51,22 @@ class OC_Log_Owncloud {
 		if($level>=$minLevel) {
 			// default to ISO8601
 			$format = OC_Config::getValue('logdateformat', 'c');
-			$time = date($format, time());
-			$entry=array('app'=>$app, 'message'=>$message, 'level'=>$level, 'time'=> $time);
+			$logtimezone=OC_Config::getValue( "logtimezone", 'UTC' );
+			try {
+				$timezone = new DateTimeZone($logtimezone);
+			} catch (Exception $e) {
+				$timezone = new DateTimeZone('UTC');
+			}
+			$time = new DateTime(null, $timezone);
+			$entry=array('app'=>$app, 'message'=>$message, 'level'=>$level, 'time'=> $time->format($format));
+			$entry = json_encode($entry);
 			$handle = @fopen(self::$logFile, 'a');
 			if ($handle) {
-				fwrite($handle, json_encode($entry)."\n");
+				fwrite($handle, $entry."\n");
 				fclose($handle);
+			} else {
+				// Fall back to error_log
+				error_log($entry);
 			}
 		}
 	}
diff --git a/lib/private/session/session.php b/lib/private/session/session.php
index c55001eccaca570e9381679646be0526855580ee..fe160faa2679196079ced3e74490ba9fc4247dc6 100644
--- a/lib/private/session/session.php
+++ b/lib/private/session/session.php
@@ -8,7 +8,10 @@
 
 namespace OC\Session;
 
-abstract class Session implements \ArrayAccess, \OCP\ISession {
+use OCP\ISession;
+
+abstract class Session implements \ArrayAccess, ISession {
+
 	/**
 	 * $name serves as a namespace for the session keys
 	 *
@@ -16,36 +19,6 @@ abstract class Session implements \ArrayAccess, \OCP\ISession {
 	 */
 	abstract public function __construct($name);
 
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 */
-	abstract public function set($key, $value);
-
-	/**
-	 * @param string $key
-	 * @return mixed should return null if $key does not exist
-	 */
-	abstract public function get($key);
-
-	/**
-	 * @param string $key
-	 * @return bool
-	 */
-	abstract public function exists($key);
-
-	/**
-	 * should not throw any errors if $key does not exist
-	 *
-	 * @param string $key
-	 */
-	abstract public function remove($key);
-
-	/**
-	 * removes all entries within the cache namespace
-	 */
-	abstract public function clear();
-
 	/**
 	 * @param mixed $offset
 	 * @return bool
diff --git a/lib/private/user.php b/lib/private/user.php
index 04cd06b08bd18f17b6960b209804daa9c4338351..b68786c773c459fc8800d0bb521357ce0fac9e2c 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -198,6 +198,10 @@ class OC_User {
 
 			// Delete user files in /data/
 			OC_Helper::rmdirr(OC_Config::getValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $uid . '/');
+			
+			return true;
+		} else {
+			return false;
 		}
 	}
 
diff --git a/lib/private/user/dummy.php b/lib/private/user/dummy.php
index b5b7a6c3c7ac7b135cc5abc0520a7d2b4246f155..52be7edfa7534433c364772831562b45ceeeae33 100644
--- a/lib/private/user/dummy.php
+++ b/lib/private/user/dummy.php
@@ -88,8 +88,8 @@ class OC_User_Dummy extends OC_User_Backend {
 	 * returns the user id or false
 	 */
 	public function checkPassword($uid, $password) {
-		if (isset($this->users[$uid])) {
-			return ($this->users[$uid] == $password);
+		if (isset($this->users[$uid]) && $this->users[$uid] === $password) {
+			return $uid;
 		} else {
 			return false;
 		}
diff --git a/lib/public/files/entitytoolargeexception.php b/lib/public/files/entitytoolargeexception.php
new file mode 100644
index 0000000000000000000000000000000000000000..3dff41bca02462aeb7312100bd4c1c79564a7936
--- /dev/null
+++ b/lib/public/files/entitytoolargeexception.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas Müller <thomas.mueller@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP\Files;
+
+class EntityTooLargeException extends \Exception {}
diff --git a/lib/public/files/invalidcontentexception.php b/lib/public/files/invalidcontentexception.php
new file mode 100644
index 0000000000000000000000000000000000000000..184ec4d06d6bf7feacced9753292f9ee486e472a
--- /dev/null
+++ b/lib/public/files/invalidcontentexception.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas Müller <thomas.mueller@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP\Files;
+
+class InvalidContentException extends \Exception {}
diff --git a/lib/public/files/invalidpathexception.php b/lib/public/files/invalidpathexception.php
new file mode 100644
index 0000000000000000000000000000000000000000..36090ae5b486204e418e0bd6c8dfe0c2131554c9
--- /dev/null
+++ b/lib/public/files/invalidpathexception.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas Müller <thomas.mueller@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP\Files;
+
+class InvalidPathException extends \Exception {}
diff --git a/lib/public/share.php b/lib/public/share.php
index e6a74117aa21b012cf9cb6ca33b6a388c30eb2ec..66605dafee50af99a5204717ccd5d13e3dbf5c47 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -155,13 +155,13 @@ class Share {
 
 		while ($source !== -1) {
 
-			// Fetch all shares of this file path from DB
+			// Fetch all shares with another user
 			$query = \OC_DB::prepare(
 				'SELECT `share_with`
 				FROM
 				`*PREFIX*share`
 				WHERE
-				`item_source` = ? AND `share_type` = ?'
+				`item_source` = ? AND `share_type` = ? AND `item_type` IN (\'file\', \'folder\')'
 			);
 
 			$result = $query->execute(array($source, self::SHARE_TYPE_USER));
@@ -180,7 +180,7 @@ class Share {
 				FROM
 				`*PREFIX*share`
 				WHERE
-				`item_source` = ? AND `share_type` = ?'
+				`item_source` = ? AND `share_type` = ? AND `item_type` IN (\'file\', \'folder\')'
 			);
 
 			$result = $query->execute(array($source, self::SHARE_TYPE_GROUP));
@@ -201,7 +201,7 @@ class Share {
 					FROM
 					`*PREFIX*share`
 					WHERE
-					`item_source` = ? AND `share_type` = ?'
+					`item_source` = ? AND `share_type` = ? AND `item_type` IN (\'file\', \'folder\')'
 				);
 
 				$result = $query->execute(array($source, self::SHARE_TYPE_LINK));
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 40106072f89cee38c76fb5606297d0ed15135054..ba3d235cf012cab46ad16a34206a8f2b51df51db 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -41,8 +41,8 @@ table.nostyle td { padding: 0.2em 0; }
 
 /* USERS */
 form { display:inline; }
-table:not(.nostyle) th { height:2em; color:#999; }
-table:not(.nostyle) th, table:not(.nostyle) td { border-bottom:1px solid #ddd; padding:0 .5em; padding-left:.8em; text-align:left; font-weight:normal; }
+table.grid th { height:2em; color:#999; }
+table.grid th, table.grid td { border-bottom:1px solid #ddd; padding:0 .5em; padding-left:.8em; text-align:left; font-weight:normal; }
 td.name, td.password { padding-left:.8em; }
 td.password>img,td.displayName>img, td.remove>a, td.quota>img { visibility:hidden; }
 td.password, td.quota, td.displayName { width:12em; cursor:pointer; }
@@ -53,7 +53,7 @@ tr:hover>td.password>span, tr:hover>td.displayName>span { margin:0; cursor:point
 tr:hover>td.remove>a, tr:hover>td.password>img,tr:hover>td.displayName>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; }
 tr:hover>td.remove>a { float:right; }
 li.selected { background-color:#ddd; }
-table:not(.nostyle) { width:100%; }
+table.grid { width:100%; }
 #rightcontent { padding-left: 1em; }
 div.quota {
 	float: right;
@@ -127,6 +127,9 @@ span.version { margin-left:1em; margin-right:1em; color:#555; }
 /* LOG */
 #log { white-space:normal; }
 #lessLog { display:none; }
+table.grid td.date{
+	white-space: nowrap;
+}
 
 /* ADMIN */
 span.securitywarning {color:#C33; font-weight:bold; }
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 3fdc2907c4604ed48bc4b965fd53176ed1544116..cdf7d0e9631010c59361611c0fa9d6d2c5ba3317 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -31,7 +31,7 @@ function changeDisplayName(){
         // Ajax foo
         $.post( 'ajax/changedisplayname.php', post, function(data){
             if( data.status === "success" ){
-                $('#oldDisplayName').text($('#displayName').val());
+                $('#oldDisplayName').val($('#displayName').val());
                 // update displayName on the top right expand button
                 $('#expandDisplayName').text($('#displayName').val());
                 updateAvatar();
@@ -171,11 +171,6 @@ $(document).ready(function(){
         }
     });
 
-	$("#languageinput").chosen();
-	// Show only the not selectable optgroup
-	// Choosen only shows optgroup-labels if there are options in the optgroup
-	$(".languagedivider").hide();
-
 	$("#languageinput").change( function(){
 		// Serialize the data
 		var post = $( "#languageinput" ).serialize();
diff --git a/settings/js/users.js b/settings/js/users.js
index 48c4529527ba93913e1de425797a5dfd546a6a8d..5b7802c1e362a25d38ade8759ef28191631c6eca 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -85,6 +85,9 @@ var UserList = {
 
 	add: function (username, displayname, groups, subadmin, quota, sort) {
 		var tr = $('tbody tr').first().clone();
+		if (tr.find('div.avatardiv')){
+			$('div.avatardiv', tr).avatar(username, 32);
+		}
 		tr.attr('data-uid', username);
 		tr.attr('data-displayName', displayname);
 		tr.find('td.name').text(username);
@@ -404,6 +407,9 @@ $(document).ready(function () {
 						OC.filePath('settings', 'ajax', 'changedisplayname.php'),
 						{username: uid, displayName: $(this).val()},
 						function (result) {
+							if (result && result.status==='success'){
+								img.parent().parent().find('div.avatardiv').avatar(result.data.username, 32);
+							}
 						}
 					);
 					input.blur();
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index c4c61c0354af5814dc27df9f71a1a325a200aa2f..de3be7c3571b8f40da751d9577bcb45e30c27968 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -73,6 +73,8 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Permet als usuaris compartir de nou elements ja compartits amb ells",
 "Allow users to share with anyone" => "Permet compartir amb qualsevol",
 "Allow users to only share with users in their groups" => "Permet als usuaris compartir només amb els usuaris del seu grup",
+"Allow mail notification" => "Permet notificacions per correu electrónic",
+"Allow user to send mail notification for shared files" => "Permet a l'usuari enviar notificacions de fitxers compartits per correu ",
 "Security" => "Seguretat",
 "Enforce HTTPS" => "Força HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Força la connexió dels clients a %s a través d'una connexió encriptada.",
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
index abbc92709e56688b9c50b480392307bc151f22ee..e84a6f573fcf76969b96b39472558238b86b75d6 100644
--- a/settings/l10n/en_GB.php
+++ b/settings/l10n/en_GB.php
@@ -73,6 +73,8 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Allow users to share items shared with them again",
 "Allow users to share with anyone" => "Allow users to share with anyone",
 "Allow users to only share with users in their groups" => "Allow users to only share with users in their groups",
+"Allow mail notification" => "Allow mail notification",
+"Allow user to send mail notification for shared files" => "Allow user to send mail notification for shared files",
 "Security" => "Security",
 "Enforce HTTPS" => "Enforce HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forces the clients to connect to %s via an encrypted connection.",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index ed23ecc077c7047471e5649793643399c215050b..be19819854da3ae48f31c692e8e4333a4d52f966 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -73,6 +73,8 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Permitir a los usuarios compartir de nuevo elementos ya compartidos",
 "Allow users to share with anyone" => "Permitir a los usuarios compartir con todo el mundo",
 "Allow users to only share with users in their groups" => "Permitir a los usuarios compartir sólo con los usuarios en sus grupos",
+"Allow mail notification" => "Permitir notificaciones por email",
+"Allow user to send mail notification for shared files" => "Permitir al usuario enviar notificaciones por email de archivos compartidos",
 "Security" => "Seguridad",
 "Enforce HTTPS" => "Forzar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forzar a los clientes a conectarse a %s por medio de una conexión encriptada.",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 10a7d764bc89b82567c248a023273bab9a98e281..d506965be7cf74a4037d86ff604daebec3271b89 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -73,6 +73,8 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Autoriser les utilisateurs à partager des éléments qui ont été partagés avec eux",
 "Allow users to share with anyone" => "Autoriser les utilisateurs à partager avec tout le monde",
 "Allow users to only share with users in their groups" => "Autoriser les utilisateurs à partager avec des utilisateurs de leur groupe uniquement",
+"Allow mail notification" => "Autoriser les notifications par couriel",
+"Allow user to send mail notification for shared files" => "Autoriser l'utilisateur à envoyer une notification par couriel concernant les fichiers partagés",
 "Security" => "Sécurité",
 "Enforce HTTPS" => "Forcer HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forcer les clients à se connecter à %s via une connexion chiffrée.",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 901ef9106e2839a9653e957bf6d5da4049d0c15a..77e7e52f993f79baa403ded730a89b7cfa29c50d 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -2,6 +2,8 @@
 $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Неможам да вчитам листа од App Store",
 "Authentication error" => "Грешка во автентикација",
+"Your display name has been changed." => "Вашето прикажано име се промени.",
+"Unable to change display name" => "Не можам да го сменам прикажанато име",
 "Group already exists" => "Групата веќе постои",
 "Unable to add group" => "Неможе да додадам група",
 "Email saved" => "Електронската пошта е снимена",
@@ -13,17 +15,30 @@ $TRANSLATIONS = array(
 "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" => "Грешка",
 "Update" => "Ажурирај",
+"Updated" => "Надграден",
 "Saving..." => "Снимам...",
+"deleted" => "избришан",
 "undo" => "врати",
+"Unable to remove user" => "Не можам да го одстранам корисникот",
 "Groups" => "Групи",
 "Group Admin" => "Администратор на група",
 "Delete" => "Избриши",
+"add group" => "додади група",
+"A valid username must be provided" => "Мора да се обезбеди валидно корисничко име ",
+"Error creating user" => "Грешка при креирање на корисникот",
+"A valid password must be provided" => "Мора да се обезбеди валидна лозинка",
 "__language_name__" => "__language_name__",
 "Security Warning" => "Безбедносно предупредување",
+"Setup Warning" => "Предупредување при подесување",
 "Log" => "Записник",
 "Log level" => "Ниво на логирање",
 "More" => "Повеќе",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 7b486768b06ffeb3a803398059563faf1bd7d3f0..6bb889d3d48276fc23323abc412c6c04266b3618 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -16,6 +16,12 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "Niet in staat om gebruiker toe te voegen aan groep %s",
 "Unable to remove user from group %s" => "Niet in staat om gebruiker te verwijderen uit groep %s",
 "Couldn't update app." => "Kon de app niet bijwerken.",
+"Wrong password" => "Onjuist wachtwoord",
+"No user supplied" => "Geen gebruiker opgegeven",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Voer een beheerdersherstelwachtwoord in, anders zullen alle gebruikersgegevens verloren gaan",
+"Wrong admin recovery password. Please check the password and try again." => "Onjuist beheerdersherstelwachtwoord. Controleer het wachtwoord en probeer het opnieuw.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleutel van de gebruiker is succesvol bijgewerkt.",
+"Unable to change password" => "Kan wachtwoord niet wijzigen",
 "Update to {appversion}" => "Bijwerken naar {appversion}",
 "Disable" => "Uitschakelen",
 "Enable" => "Activeer",
@@ -67,6 +73,8 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Toestaan dat gebruikers objecten die anderen met hun gedeeld hebben zelf ook weer delen met anderen",
 "Allow users to share with anyone" => "Toestaan dat gebruikers met iedereen delen",
 "Allow users to only share with users in their groups" => "Instellen dat gebruikers alleen met leden binnen hun groepen delen",
+"Allow mail notification" => "Toestaan e-mailnotificaties",
+"Allow user to send mail notification for shared files" => "Sta gebruikers toe om e-mailnotificaties  te versturen voor gedeelde bestanden",
 "Security" => "Beveiliging",
 "Enforce HTTPS" => "Afdwingen HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Dwingt de clients om een versleutelde verbinding te maken met %s",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 6cce72df4b6d64847ea3c17fdea04aea1cba4189..f1a91a345cf0acde42a19c754232ab6cd2cf0ae2 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -69,6 +69,8 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Zezwalaj użytkownikom na ponowne współdzielenie zasobów już z nimi współdzielonych",
 "Allow users to share with anyone" => "Zezwalaj użytkownikom na współdzielenie z kimkolwiek",
 "Allow users to only share with users in their groups" => "Zezwalaj użytkownikom współdzielić z użytkownikami ze swoich grup",
+"Allow mail notification" => "Pozwól na mailowe powiadomienia",
+"Allow user to send mail notification for shared files" => "Pozwól użytkownikom wysyłać maile powiadamiające o udostępnionych plikach",
 "Security" => "Bezpieczeństwo",
 "Enforce HTTPS" => "Wymuś HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego.",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index b664d2be3db7ca554bb2b2814729e826e9404574..51182f01c8ce64ffec2bb0afcc7f91faaf677bf0 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -16,6 +16,11 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "Impossível acrescentar utilizador ao grupo %s",
 "Unable to remove user from group %s" => "Impossível apagar utilizador do grupo %s",
 "Couldn't update app." => "Não foi possível actualizar a aplicação.",
+"Wrong password" => "Password errada",
+"No user supplied" => "Nenhum utilizador especificado.",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Por favor forneça uma palavra chave de recuperação de administrador, caso contrário todos os dados de utilizador serão perdidos",
+"Wrong admin recovery password. Please check the password and try again." => "Palavra chave de recuperação de administrador errada. Por favor verifique a palavra chave e tente de novo.",
+"Unable to change password" => "Não foi possível alterar a sua password",
 "Update to {appversion}" => "Actualizar para a versão {appversion}",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
@@ -27,6 +32,7 @@ $TRANSLATIONS = array(
 "Error" => "Erro",
 "Update" => "Actualizar",
 "Updated" => "Actualizado",
+"Select a profile picture" => "Seleccione uma fotografia de perfil",
 "Decrypting files... Please wait, this can take some time." => "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.",
 "Saving..." => "A guardar...",
 "deleted" => "apagado",
@@ -66,6 +72,8 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Permitir que os utilizadores partilhem itens partilhados com eles",
 "Allow users to share with anyone" => "Permitir que os utilizadores partilhem com todos",
 "Allow users to only share with users in their groups" => "Permitir que os utilizadores partilhem somente com utilizadores do seu grupo",
+"Allow mail notification" => "Permitir notificação por email",
+"Allow user to send mail notification for shared files" => "Permitir que o utilizador envie notificações por correio electrónico para ficheiros partilhados",
 "Security" => "Segurança",
 "Enforce HTTPS" => "Forçar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forçar os clientes a ligar a %s através de uma ligação encriptada",
@@ -101,7 +109,12 @@ $TRANSLATIONS = array(
 "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",
 "Profile picture" => "Foto do perfil",
+"Upload new" => "Carregar novo",
+"Select new from Files" => "Seleccionar novo a partir dos ficheiros",
+"Remove image" => "Remover imagem",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Apenas png ou jpg. Idealmente quadrada, mas poderá corta-la depois.",
 "Abort" => "Abortar",
+"Choose as profile image" => "Escolha uma fotografia de perfil",
 "Language" => "Idioma",
 "Help translate" => "Ajude a traduzir",
 "WebDAV" => "WebDAV",
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 6450cd62d9518628b738800c9c2bf84d46089c11..1091b1dab54af9e9095e353ecca699051b625ecb 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -118,7 +118,7 @@ if (!$_['internetconnectionworking']) {
 
 <fieldset class="personalblock" id="shareAPI">
 	<h2><?php p($l->t('Sharing'));?></h2>
-	<table class="shareAPI nostyle">
+	<table class="shareAPI">
 		<tr>
 			<td id="enable">
 				<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled"
@@ -176,10 +176,10 @@ if (!$_['internetconnectionworking']) {
 
 <fieldset class="personalblock" id="security">
 	<h2><?php p($l->t('Security'));?></h2>
-	<table class="nostyle">
+	<table>
 		<tr>
 			<td id="enable">
-				<input type="checkbox" name="forcessl"  id="enforceHTTPSEnabled"
+				<input type="checkbox" name="forcessl"  id="forcessl"
 					<?php if ($_['enforceHTTPSEnabled']) {
 						print_unescaped('checked="checked" ');
 						print_unescaped('value="false"');
@@ -217,7 +217,7 @@ if (!$_['internetconnectionworking']) {
 		<?php endif;
 endfor;?>
 </select>
-	<table id="log">
+	<table id="log" class="grid">
 		<?php foreach ($_['entries'] as $entry): ?>
 		<tr>
 			<td>
@@ -229,7 +229,7 @@ endfor;?>
 			<td>
 				<?php p($entry->message);?>
 			</td>
-			<td>
+			<td class="date">
 				<?php if(is_int($entry->time)){
 					p(OC_Util::formatDate($entry->time));
 				} else {
@@ -248,7 +248,7 @@ endfor;?>
 
 <fieldset class="personalblock">
 	<h2><?php p($l->t('Version'));?></h2>
-	<strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getVersionString()); ?>
+	<strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getVersionString().' ('.OC_Util::getChannel().')'); ?>
 <?php if (OC_Util::getEditionString() === ''): ?>
 	<p>
 		<?php print_unescaped($l->t('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>.')); ?>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 47227d6ea0fe5501967fea3b66d61bdbfc635adb..60c509b4a1cab2de8beee9ab463c973d3816257e 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -104,19 +104,27 @@ if($_['passwordChangeSupported']) {
 <form>
 	<fieldset class="personalblock">
 		<h2><?php p($l->t('Language'));?></h2>
-		<select id="languageinput" class="chzen-select" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
-		<option value="<?php p($_['activelanguage']['code']);?>"><?php p($_['activelanguage']['name']);?></option>
-		<?php foreach($_['commonlanguages'] as $language):?>
-			<option value="<?php p($language['code']);?>"><?php p($language['name']);?></option>
-		<?php endforeach;?>
-		<optgroup label="––––––––––"><option class="languagedivider">-</option></optgroup>
-		<?php foreach($_['languages'] as $language):?>
-			<option value="<?php p($language['code']);?>"><?php p($language['name']);?></option>
-		<?php endforeach;?>
+		<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
+			<option value="<?php p($_['activelanguage']['code']);?>">
+				<?php p($_['activelanguage']['name']);?>
+			</option>
+			<?php foreach($_['commonlanguages'] as $language):?>
+				<option value="<?php p($language['code']);?>">
+					<?php p($language['name']);?>
+				</option>
+			<?php endforeach;?>
+			<optgroup label="––––––––––"></optgroup>
+			<?php foreach($_['languages'] as $language):?>
+				<option value="<?php p($language['code']);?>">
+					<?php p($language['name']);?>
+				</option>
+			<?php endforeach;?>
 		</select>
 		<?php if (OC_Util::getEditionString() === ''): ?>
 		<a href="https://www.transifex.com/projects/p/owncloud/team/<?php p($_['activelanguage']['code']);?>/"
-			target="_blank"><em><?php p($l->t('Help translate'));?></em></a>
+			target="_blank">
+			<em><?php p($l->t('Help translate'));?></em>
+		</a>
 		<?php endif; ?>
 	</fieldset>
 </form>
@@ -159,7 +167,7 @@ if($_['passwordChangeSupported']) {
 
 <fieldset class="personalblock">
 	<h2><?php p($l->t('Version'));?></h2>
-	<strong><?php p($theme->getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?><br/>
+	<strong><?php p($theme->getName()); ?></strong> <?php p(OC_Util::getVersionString().' ('.OC_Util::getChannel().')'); ?><br />
 <?php if (OC_Util::getEditionString() === ''): ?>
 	<?php print_unescaped($l->t('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>.')); ?>
 <?php endif; ?>
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 747d052a7bd959c7f99b534261f2db2e1f6a9627..b556ef4b92e6b4c7dc16a7ebd5045ad8cf038bc5 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -78,7 +78,7 @@ $_['subadmingroups'] = array_flip($items);
 	</div>
 </div>
 
-<table class="hascontrols" data-groups="<?php p(json_encode($allGroups));?>">
+<table class="hascontrols grid" data-groups="<?php p(json_encode($allGroups));?>">
 	<thead>
 		<tr>
 			<?php if ($_['enableAvatars']): ?>
diff --git a/tests/lib/connector/sabre/objecttree.php b/tests/lib/connector/sabre/objecttree.php
index 1d76bb596766035b264b4ebf9ce67efd6e615460..e32f2365f9515ff0e1f045ae328bc8e9ae7f3bd4 100644
--- a/tests/lib/connector/sabre/objecttree.php
+++ b/tests/lib/connector/sabre/objecttree.php
@@ -15,8 +15,9 @@ use Sabre_DAV_Exception_Forbidden;
 
 class TestDoubleFileView extends \OC\Files\View{
 
-	public function __construct($updatables, $canRename = true) {
+	public function __construct($updatables, $deletables, $canRename = true) {
 		$this->updatables = $updatables;
+		$this->deletables = $deletables;
 		$this->canRename = $canRename;
 	}
 
@@ -24,6 +25,10 @@ class TestDoubleFileView extends \OC\Files\View{
 		return $this->updatables[$path];
 	}
 
+	public function isDeletable($path) {
+		return $this->deletables[$path];
+	}
+
 	public function rename($path1, $path2) {
 		return $this->canRename;
 	}
@@ -35,31 +40,32 @@ class ObjectTree extends PHPUnit_Framework_TestCase {
 	 * @dataProvider moveFailedProvider
 	 * @expectedException Sabre_DAV_Exception_Forbidden
 	 */
-	public function testMoveFailed($source, $dest, $updatables) {
-		$this->moveTest($source, $dest, $updatables);
+	public function testMoveFailed($source, $dest, $updatables, $deletables) {
+		$this->moveTest($source, $dest, $updatables, $deletables);
 	}
 
 	/**
 	 * @dataProvider moveSuccessProvider
 	 */
-	public function testMoveSuccess($source, $dest, $updatables) {
-		$this->moveTest($source, $dest, $updatables);
+	public function testMoveSuccess($source, $dest, $updatables, $deletables) {
+		$this->moveTest($source, $dest, $updatables, $deletables);
 		$this->assertTrue(true);
 	}
 
 	function moveFailedProvider() {
 		return array(
-			array('a/b', 'a/c', array('a' => false, 'a/b' => false, 'a/c' => false)),
-			array('a/b', 'b/b', array('a' => false, 'a/b' => false, 'b' => false, 'b/b' => false)),
-			array('a/b', 'b/b', array('a' => false, 'a/b' => true, 'b' => false, 'b/b' => false)),
-			array('a/b', 'b/b', array('a' => true, 'a/b' => true, 'b' => false, 'b/b' => false)),
+			array('a/b', 'a/c', array('a' => false, 'a/b' => false, 'a/c' => false), array()),
+			array('a/b', 'b/b', array('a' => false, 'a/b' => false, 'b' => false, 'b/b' => false), array()),
+			array('a/b', 'b/b', array('a' => false, 'a/b' => true, 'b' => false, 'b/b' => false), array()),
+			array('a/b', 'b/b', array('a' => true, 'a/b' => true, 'b' => false, 'b/b' => false), array()),
+			array('a/b', 'b/b', array('a' => true, 'a/b' => true, 'b' => true, 'b/b' => false), array('a/b' => false)),
 		);
 	}
 
 	function moveSuccessProvider() {
 		return array(
-			array('a/b', 'a/c', array('a' => false, 'a/b' => true, 'a/c' => false)),
-			array('a/b', 'b/b', array('a' => true, 'a/b' => true, 'b' => true, 'b/b' => false)),
+			array('a/b', 'a/c', array('a' => false, 'a/b' => true, 'a/c' => false), array()),
+			array('a/b', 'b/b', array('a' => true, 'a/b' => true, 'b' => true, 'b/b' => false), array('a/b' => true)),
 		);
 	}
 
@@ -68,7 +74,7 @@ class ObjectTree extends PHPUnit_Framework_TestCase {
 	 * @param $dest
 	 * @param $updatables
 	 */
-	private function moveTest($source, $dest, $updatables) {
+	private function moveTest($source, $dest, $updatables, $deletables) {
 		$rootDir = new OC_Connector_Sabre_Directory('');
 		$objectTree = $this->getMock('\OC\Connector\Sabre\ObjectTree',
 			array('nodeExists', 'getNodeForPath'),
@@ -80,7 +86,7 @@ class ObjectTree extends PHPUnit_Framework_TestCase {
 			->will($this->returnValue(false));
 
 		/** @var $objectTree \OC\Connector\Sabre\ObjectTree */
-		$objectTree->fileView = new TestDoubleFileView($updatables);
+		$objectTree->fileView = new TestDoubleFileView($updatables, $deletables);
 		$objectTree->move($source, $dest);
 	}
 
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 3043f132b73ea118af1e7bcd1f6e4f752c613f70..0cc86d6651a5029a0ebaf92fda5082e32a14620a 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -391,4 +391,81 @@ class View extends \PHPUnit_Framework_TestCase {
 		$this->storages[] = $storage;
 		return $storage;
 	}
+
+	private $createHookPath;
+
+	function dummyCreateHook($params) {
+		$this->createHookPath = $params['path'];
+	}
+
+	/**
+	 * @medium
+	 */
+	function testViewHooksIfRootStartsTheSame() {
+		$storage1 = $this->getTestStorage();
+		$storage2 = $this->getTestStorage();
+		$defaultRoot = \OC\Files\Filesystem::getRoot();
+		\OC\Files\Filesystem::mount($storage1, array(), '/');
+		\OC\Files\Filesystem::mount($storage2, array(), $defaultRoot . '_substorage');
+		\OC_Hook::connect('OC_Filesystem', 'post_write', $this, 'dummyHook');
+
+		$subView = new \OC\Files\View($defaultRoot . '_substorage');
+		$this->hookPath = null;
+
+		$subView->file_put_contents('/foo.txt', 'asd');
+		$this->assertNull($this->hookPath);
+	}
+
+	public function testEditNoCreateHook() {
+		$storage1 = $this->getTestStorage();
+		$storage2 = $this->getTestStorage();
+		$defaultRoot = \OC\Files\Filesystem::getRoot();
+		\OC\Files\Filesystem::mount($storage1, array(), '/');
+		\OC\Files\Filesystem::mount($storage2, array(), $defaultRoot);
+		\OC_Hook::connect('OC_Filesystem', 'post_create', $this, 'dummyCreateHook');
+
+		$view = new \OC\Files\View($defaultRoot);
+		$this->hookPath = null;
+
+		$view->file_put_contents('/asd.txt', 'foo');
+		$this->assertEquals('/asd.txt', $this->createHookPath);
+		$this->createHookPath = null;
+
+		$view->file_put_contents('/asd.txt', 'foo');
+		$this->assertNull($this->createHookPath);
+	}
+
+	/**
+	 * @dataProvider resolvePathTestProvider
+	 */
+	public function testResolvePath($expected, $pathToTest) {
+		$storage1 = $this->getTestStorage();
+		\OC\Files\Filesystem::mount($storage1, array(), '/');
+
+		$view = new \OC\Files\View('');
+
+		$result = $view->resolvePath($pathToTest);
+		$this->assertEquals($expected, $result[1]);
+
+		$exists = $view->file_exists($pathToTest);
+		$this->assertTrue($exists);
+
+		$exists = $view->file_exists($result[1]);
+		$this->assertTrue($exists);
+	}
+
+	function resolvePathTestProvider() {
+		return array(
+			array('foo.txt', 'foo.txt'),
+			array('foo.txt', '/foo.txt'),
+			array('folder', 'folder'),
+			array('folder', '/folder'),
+			array('folder', 'folder/'),
+			array('folder', '/folder/'),
+			array('folder/bar.txt', 'folder/bar.txt'),
+			array('folder/bar.txt', '/folder/bar.txt'),
+			array('', ''),
+			array('', '/'),
+		);
+	}
 }
diff --git a/tests/lib/user.php b/tests/lib/user.php
index 66c7f3f0d747a93c1b1437f14a9d5309470473eb..fdf9e7a08e0ac77e857b26368c773cec186eac42 100644
--- a/tests/lib/user.php
+++ b/tests/lib/user.php
@@ -12,18 +12,26 @@ namespace Test;
 use OC\Hooks\PublicEmitter;
 
 class User extends \PHPUnit_Framework_TestCase {
-
+	/**
+	 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+	 */
+	private $backend;
+	
+	protected function setUp(){
+		$this->backend = $this->getMock('\OC_User_Dummy');
+		$manager = \OC_User::getManager();
+		$manager->registerBackend($this->backend);
+	}
+	
 	public function testCheckPassword() {
-		/**
-		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
-		 */
-		$backend = $this->getMock('\OC_User_Dummy');
-		$backend->expects($this->once())
+
+		$this->backend->expects($this->once())
 			->method('checkPassword')
 			->with($this->equalTo('foo'), $this->equalTo('bar'))
-			->will($this->returnValue('foo'));
+			->will($this->returnValue('foo'))
+		;
 
-		$backend->expects($this->any())
+		$this->backend->expects($this->any())
 			->method('implementsActions')
 			->will($this->returnCallback(function ($actions) {
 				if ($actions === \OC_USER_BACKEND_CHECK_PASSWORD) {
@@ -33,11 +41,33 @@ class User extends \PHPUnit_Framework_TestCase {
 				}
 			}));
 
-		$manager = \OC_User::getManager();
-		$manager->registerBackend($backend);
-
 		$uid = \OC_User::checkPassword('foo', 'bar');
 		$this->assertEquals($uid, 'foo');
 	}
+	
+	public function testDeleteUser() {
+		$fail = \OC_User::deleteUser('victim');
+		$this->assertFalse($fail);
+		
+		$success = \OC_User::createUser('victim', 'password');
+		
+		$success = \OC_User::deleteUser('victim');
+		$this->assertTrue($success);
+	}
+	
+	public function testCreateUser(){
+		$this->backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnCallback(function ($actions) {
+				if ($actions === \OC_USER_BACKEND_CREATE_USER) {
+					return true;
+				} else {
+					return false;
+				}
+			}));
+			
+		$user = \OC_User::createUser('newuser', 'newpassword');
+		$this->assertEquals('newuser', $user->getUid());
+	}
 
 }
\ No newline at end of file
diff --git a/tests/lib/user/backend.php b/tests/lib/user/backend.php
index 40674424c96efb918f0c518532566122a4c60e80..1384c54a92161dd8971d53f1803a97acb4cc1852 100644
--- a/tests/lib/user/backend.php
+++ b/tests/lib/user/backend.php
@@ -39,7 +39,7 @@ abstract class Test_User_Backend extends PHPUnit_Framework_TestCase {
 	/**
 	 * get a new unique user name
 	 * test cases can override this in order to clean up created user
-	 * @return array
+	 * @return string
 	 */
 	public function getUser() {
 		return uniqid('test_');
@@ -82,8 +82,8 @@ abstract class Test_User_Backend extends PHPUnit_Framework_TestCase {
 		$this->assertTrue($this->backend->userExists($name1));
 		$this->assertTrue($this->backend->userExists($name2));
 		
-		$this->assertTrue($this->backend->checkPassword($name1, 'pass1'));
-		$this->assertTrue($this->backend->checkPassword($name2, 'pass2'));
+		$this->assertSame($name1, $this->backend->checkPassword($name1, 'pass1'));
+		$this->assertSame($name2, $this->backend->checkPassword($name2, 'pass2'));
 		
 		$this->assertFalse($this->backend->checkPassword($name1, 'pass2'));
 		$this->assertFalse($this->backend->checkPassword($name2, 'pass1'));
@@ -93,7 +93,7 @@ abstract class Test_User_Backend extends PHPUnit_Framework_TestCase {
 		
 		$this->backend->setPassword($name1, 'newpass1');
 		$this->assertFalse($this->backend->checkPassword($name1, 'pass1'));
-		$this->assertTrue($this->backend->checkPassword($name1, 'newpass1'));
+		$this->assertSame($name1, $this->backend->checkPassword($name1, 'newpass1'));
 		$this->assertFalse($this->backend->checkPassword($name2, 'newpass1'));
 	}
 }
diff --git a/tests/lib/user/database.php b/tests/lib/user/database.php
index fe7d87c44de2bc9a2cd564e8993ae3f25a6728dd..d7cc39ae387831e48c78891d4fe691ae7ccd392d 100644
--- a/tests/lib/user/database.php
+++ b/tests/lib/user/database.php
@@ -21,19 +21,14 @@
 */
 
 class Test_User_Database extends Test_User_Backend {
-	/**
-	 * get a new unique user name
-	 * test cases can override this in order to clean up created user
-	 * @return array
-	 */
 	public function getUser() {
-		$user=uniqid('test_');
+		$user = parent::getUser();
 		$this->users[]=$user;
 		return $user;
 	}
 	
 	public function setUp() {
-		$this->backend=new OC_User_Dummy();
+		$this->backend=new OC_User_Database();
 	}
 	
 	public function tearDown() {
diff --git a/version.php b/version.php
index b4396d1d2d8ae5f4c9e4398f46684e655c28123b..8386ee6f8751a6c9db3b9c97954ccc2746dbec13 100644
--- a/version.php
+++ b/version.php
@@ -1,16 +1,16 @@
 <?php
 
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel when updating major/minor version number.
-$OC_Version=array(5, 80, 8, 1);
+$OC_Version=array(6, 00, 0, 0);
 
 // The human radable string
-$OC_VersionString='6.0 pre alpha';
+$OC_VersionString='6.0 alpha 1';
 
 // The ownCloud edition
 $OC_Edition='';
 
 // The ownCloud channel
-$OC_Channel='';
+$OC_Channel='git';
 
 // The build number
 $OC_Build='';