diff --git a/.gitignore b/.gitignore
index 43f3cab9121ba3a64d453d6e51d82c0498ef94c0..724f2460b04fc743547b3e90798510b593399be6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,6 +82,9 @@ nbproject
 # Tests
 /tests/phpunit.xml
 
+# Node Modules
+/build/node_modules/
+
 # Tests - auto-generated files
 /data-autotest
 /tests/coverage*
diff --git a/3rdparty b/3rdparty
index 75a05d76ab86ba7454b4312fd0ff2ca5bd5828cf..21b466b72cdd4c823c011669593ecef1defb1f3c 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 75a05d76ab86ba7454b4312fd0ff2ca5bd5828cf
+Subproject commit 21b466b72cdd4c823c011669593ecef1defb1f3c
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index dde5d3c50af32e032567a812ce1be2465e96b13b..1d03cd89f83c9510b3f2a640ce5158eb95cb2c5e 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -105,16 +105,20 @@ if (strpos($dir, '..') === false) {
 			$meta = \OC\Files\Filesystem::getFileInfo($target);
 			// updated max file size after upload
 			$storageStats = \OCA\files\lib\Helper::buildFileStorageStatistics($dir);
-
-			$result[] = array('status' => 'success',
-				'mime' => $meta['mimetype'],
-				'size' => $meta['size'],
-				'id' => $meta['fileid'],
-				'name' => basename($target),
-				'originalname' => $files['name'][$i],
-				'uploadMaxFilesize' => $maxUploadFileSize,
-				'maxHumanFilesize' => $maxHumanFileSize
-			);
+			if ($meta === false) {
+				OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Upload failed')), $storageStats)));
+				exit();
+			} else {
+				$result[] = array('status' => 'success',
+					'mime' => $meta['mimetype'],
+					'size' => $meta['size'],
+					'id' => $meta['fileid'],
+					'name' => basename($target),
+					'originalname' => $files['name'][$i],
+					'uploadMaxFilesize' => $maxUploadFileSize,
+					'maxHumanFilesize' => $maxHumanFileSize
+				);
+			}
 		}
 	}
 	OCP\JSON::encodedPrint($result);
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index a2cf8398c2724c2020256872ffbbd79196d34eb3..af0cb83581160409e75b054c19b0342bcc9b1796 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -72,7 +72,7 @@
 	color:#888; text-shadow:#fff 0 1px 0;
 }
 #filestable { position: relative; top:37px; width:100%; }
-tbody tr { background-color:#fff; height:2.5em; }
+#filestable tbody tr { background-color:#fff; height:2.5em; }
 tbody tr:hover, tbody tr:active {
 	background-color: rgb(240,240,240);
 }
@@ -94,7 +94,7 @@ table th#headerDate, table td.date { min-width:11em; padding:0 .1em 0 1em; text-
 
 /* Multiselect bar */
 #filestable.multiselect { top:63px; }
-table.multiselect thead { position:fixed; top:82px; z-index:1; -moz-box-sizing: border-box; box-sizing: border-box; left: 0; padding-left: 64px; width:100%; }
+table.multiselect thead { position:fixed; top:82px; z-index:1; -moz-box-sizing: border-box; box-sizing: border-box; left: 0; padding-left: 80px; width:100%; }
 table.multiselect thead th {
 	background-color: rgba(210,210,210,.7);
 	color: #000;
@@ -170,7 +170,20 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
 }
 
 .summary {
-	opacity: .5;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
+	filter: alpha(opacity=30);
+	opacity: .3;
+	height: 70px;
+}
+
+.summary:hover, .summary, table tr.summary td {
+	background-color: transparent;
+}
+
+.summary td {
+	padding-top: 8px;
+	padding-bottom: 8px;
+	border-bottom: none;
 }
 
 .summary .info {
diff --git a/apps/files/index.php b/apps/files/index.php
index 94c792303da747a04e4dfdc0a09420b8bcb7e187..e4d8e353858e185e3b5b654f8cd4814761080b12 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -119,7 +119,7 @@ if ($needUpgrade) {
 	$tmpl->printPage();
 } else {
 	// information about storage capacities
-	$storageInfo=OC_Helper::getStorageInfo();
+	$storageInfo=OC_Helper::getStorageInfo($dir);
 	$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir);
 	$publicUploadEnabled = \OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes');
 	if (OC_App::isEnabled('files_encryption')) {
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index f262f11f06539a112f3a13f6656127f1c743a63a..1e6ab74fb6d92e59a8f5afb2c8d18f9b376525b8 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -102,6 +102,18 @@ $(document).ready(function() {
 			var result=$.parseJSON(response);
 
 			if(typeof result[0] !== 'undefined' && result[0].status === 'success') {
+				var filename = result[0].originalname;
+
+				// delete jqXHR reference
+				if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') {
+					var dirName = data.context.data('file');
+					delete uploadingFiles[dirName][filename];
+					if ($.assocArraySize(uploadingFiles[dirName]) == 0) {
+						delete uploadingFiles[dirName];
+					}
+				} else {
+					delete uploadingFiles[filename];
+				}
 				var file = result[0];
 			} else {
 				data.textStatus = 'servererror';
@@ -109,20 +121,6 @@ $(document).ready(function() {
 				var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
 				fu._trigger('fail', e, data);
 			}
-
-			var filename = result[0].originalname;
-
-			// delete jqXHR reference
-			if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') {
-				var dirName = data.context.data('file');
-				delete uploadingFiles[dirName][filename];
-				if ($.assocArraySize(uploadingFiles[dirName]) == 0) {
-					delete uploadingFiles[dirName];
-				}
-			} else {
-				delete uploadingFiles[filename];
-			}
-
 		},
 		/**
 		 * called after last upload
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 10801af3eadd7fffd28d021d2c6b5bd1dd35b7bf..e11cc70802bb38ae079931d516dbe7acb5159394 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -144,6 +144,7 @@ var FileList={
 	remove:function(name){
 		$('tr').filterAttr('data-file',name).find('td.filename').draggable('destroy');
 		$('tr').filterAttr('data-file',name).remove();
+		FileList.updateFileSummary();
 		if($('tr[data-file]').length==0){
 			$('#emptyfolder').show();
 		}
@@ -176,6 +177,7 @@ var FileList={
 			$('#fileList').append(element);
 		}
 		$('#emptyfolder').hide();
+		FileList.updateFileSummary();
 	},
 	loadingDone:function(name, id){
 		var mime, tr=$('tr').filterAttr('data-file',name);
@@ -391,6 +393,7 @@ var FileList={
 						});
 						procesSelection();
 						checkTrashStatus();
+						FileList.updateFileSummary();
 					} else {
 						$.each(files,function(index,file) {
 							var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date").children(".action.delete");
@@ -398,6 +401,111 @@ var FileList={
 						});
 					}
 				});
+	},
+	createFileSummary: function() {
+		if( $('#fileList tr').length > 0 ) {
+			var totalDirs = 0;
+			var totalFiles = 0;
+			var totalSize = 0;
+
+			// Count types and filesize
+			$.each($('tr[data-file]'), function(index, value) {
+				if ($(value).data('type') === 'dir') {
+					totalDirs++;
+				} else if ($(value).data('type') === 'file') {
+					totalFiles++;
+				}
+				totalSize += parseInt($(value).data('size'));
+			});
+
+			// Get translations
+			var directoryInfo = n('files', '%n folder', '%n folders', totalDirs);
+			var fileInfo = n('files', '%n file', '%n files', totalFiles);
+
+			var infoVars = {
+				dirs: '<span class="dirinfo">'+directoryInfo+'</span><span class="connector">',
+				files: '</span><span class="fileinfo">'+fileInfo+'</span>'
+			}
+
+			var info = t('files', '{dirs} and {files}', infoVars);
+
+			// don't show the filesize column, if filesize is NaN (e.g. in trashbin)
+			if (isNaN(totalSize)) {
+				var fileSize = '';
+			} else {
+				var fileSize = '<td class="filesize">'+humanFileSize(totalSize)+'</td>';
+			}
+
+			$('#fileList').append('<tr class="summary"><td><span class="info">'+info+'</span></td>'+fileSize+'<td></td></tr>');
+
+			var $dirInfo = $('.summary .dirinfo');
+			var $fileInfo = $('.summary .fileinfo');
+			var $connector = $('.summary .connector');
+
+			// Show only what's necessary, e.g.: no files: don't show "0 files"
+			if ($dirInfo.html().charAt(0) === "0") {
+				$dirInfo.hide();
+				$connector.hide();
+			}
+			if ($fileInfo.html().charAt(0) === "0") {
+				$fileInfo.hide();
+				$connector.hide();
+			}
+		}
+	},
+	updateFileSummary: function() {
+		var $summary = $('.summary');
+
+		// Check if we should remove the summary to show "Upload something"
+		if ($('#fileList tr').length === 1 && $summary.length === 1) {
+			$summary.remove();
+		}
+		// If there's no summary create one (createFileSummary checks if there's data)
+		else if ($summary.length === 0) {
+			FileList.createFileSummary();
+		}
+		// There's a summary and data -> Update the summary
+		else if ($('#fileList tr').length > 1 && $summary.length === 1) {
+			var totalDirs = 0;
+			var totalFiles = 0;
+			var totalSize = 0;
+			$.each($('tr[data-file]'), function(index, value) {
+				if ($(value).data('type') === 'dir') {
+					totalDirs++;
+				} else if ($(value).data('type') === 'file') {
+					totalFiles++;
+				}
+				if ($(value).data('size') !== undefined) {
+					totalSize += parseInt($(value).data('size'));
+				}
+			});
+
+			var $dirInfo = $('.summary .dirinfo');
+			var $fileInfo = $('.summary .fileinfo');
+			var $connector = $('.summary .connector');
+
+			// Substitute old content with new translations
+			$dirInfo.html(n('files', '%n folder', '%n folders', totalDirs));
+			$fileInfo.html(n('files', '%n file', '%n files', totalFiles));
+			$('.summary .filesize').html(humanFileSize(totalSize));
+
+			// Show only what's necessary (may be hidden)
+			if ($dirInfo.html().charAt(0) === "0") {
+				$dirInfo.hide();
+				$connector.hide();
+			} else {
+				$dirInfo.show();
+			}
+			if ($fileInfo.html().charAt(0) === "0") {
+				$fileInfo.hide();
+				$connector.hide();
+			} else {
+				$fileInfo.show();
+			}
+			if ($dirInfo.html().charAt(0) !== "0" && $fileInfo.html().charAt(0) !== "0") {
+				$connector.show();
+			}
+		}
 	}
 };
 
@@ -599,4 +707,6 @@ $(document).ready(function(){
 	$(window).unload(function (){
 		$(window).trigger('beforeunload');
 	});
+
+	FileList.createFileSummary();
 });
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index 7161e49a96885aab6f62cfc5aec9972ac05e99e9..8346eece88b7c7f4a310195e5624c336986d8a1c 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -28,6 +28,8 @@ $TRANSLATIONS = array(
 "cancel" => "إلغاء",
 "replaced {new_name} with {old_name}" => "استبدل {new_name}  بـ  {old_name}",
 "undo" => "تراجع",
+"_%n folder_::_%n folders_" => array("","","","","",""),
+"_%n file_::_%n files_" => array("","","","","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","","","","",""),
 "'.' is an invalid file name." => "\".\" اسم ملف غير صحيح.",
 "File name cannot be empty." => "اسم الملف لا يجوز أن يكون فارغا",
@@ -35,12 +37,9 @@ $TRANSLATIONS = array(
 "Your storage is full, files can not be updated or synced anymore!" => "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !",
 "Your storage is almost full ({usedSpacePercent}%)" => "مساحتك التخزينية امتلأت تقريبا ",
 "Your download is being prepared. This might take some time if the files are big." => "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "إسم مجلد غير صحيح. استخدام مصطلح \"Shared\" محجوز للنظام",
 "Name" => "اسم",
 "Size" => "حجم",
 "Modified" => "معدل",
-"_%n folder_::_%n folders_" => array("","","","","",""),
-"_%n file_::_%n files_" => array("","","","","",""),
 "Upload" => "رفع",
 "File handling" => "التعامل مع الملف",
 "Maximum upload size" => "الحد الأقصى لحجم الملفات التي يمكن رفعها",
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index 1e2104370ba5dc8042e8fdfbceaf9fbb2ded7bba..e7dafd1c43a584c5b7f0efed9c66c89d27f7de85 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -17,12 +17,12 @@ $TRANSLATIONS = array(
 "replace" => "препокриване",
 "cancel" => "отказ",
 "undo" => "възтановяване",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Name" => "Име",
 "Size" => "Размер",
 "Modified" => "Променено",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "Качване",
 "Maximum upload size" => "Максимален размер за качване",
 "0 is unlimited" => "Ползвайте 0 за без ограничения",
@@ -36,7 +36,6 @@ $TRANSLATIONS = array(
 "Delete" => "Изтриване",
 "Upload too large" => "Файлът който сте избрали за качване е прекалено голям",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файловете които се опитвате да качите са по-големи от позволеното за сървъра.",
-"Files are being scanned, please wait." => "Файловете се претърсват, изчакайте.",
-"file" => "файл"
+"Files are being scanned, please wait." => "Файловете се претърсват, изчакайте."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php
index 2f05a3eccf818636a09a32e5295ab5ba7c457871..2265c232a1485ade94e047178910cf0248d11879 100644
--- a/apps/files/l10n/bn_BD.php
+++ b/apps/files/l10n/bn_BD.php
@@ -27,16 +27,15 @@ $TRANSLATIONS = array(
 "cancel" => "বাতিল",
 "replaced {new_name} with {old_name}" => "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে",
 "undo" => "ক্রিয়া প্রত্যাহার",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "'.' is an invalid file name." => "টি একটি অননুমোদিত নাম।",
 "File name cannot be empty." => "ফাইলের নামটি ফাঁকা রাখা যাবে না।",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "নামটি সঠিক নয়,  '\\', '/', '<', '>', ':', '\"', '|', '?' এবং  '*'  অনুমোদিত নয়।",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "ফোল্ডারের নামটি সঠিক নয়। 'ভাগাভাগি করা' শুধুমাত্র Owncloud  এর জন্য সংরক্ষিত।",
 "Name" => "রাম",
 "Size" => "আকার",
 "Modified" => "পরিবর্তিত",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "আপলোড",
 "File handling" => "ফাইল হ্যার্ডলিং",
 "Maximum upload size" => "আপলোডের সর্বোচ্চ আকার",
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 3429f572fd2003b8e0681f73eb52360c78ae6d2e..9f90138eebed06399355c7ea6aeaffd49f4c44d9 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "cancel·la",
 "replaced {new_name} with {old_name}" => "s'ha substituït {old_name} per {new_name}",
 "undo" => "desfés",
+"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetes"),
+"_%n file_::_%n files_" => array("%n fitxer","%n fitxers"),
 "_Uploading %n file_::_Uploading %n files_" => array("Pujant %n fitxer","Pujant %n fitxers"),
 "files uploading" => "fitxers pujant",
 "'.' is an invalid file name." => "'.' és un nom no vàlid per un fitxer.",
@@ -41,12 +43,9 @@ $TRANSLATIONS = array(
 "Your storage is almost full ({usedSpacePercent}%)" => "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "L'encriptació s'ha desactivat però els vostres fitxers segueixen encriptats. Aneu a la vostra configuració personal per desencriptar els vostres fitxers.",
 "Your download is being prepared. This might take some time if the files are big." => "S'està preparant la baixada. Pot trigar una estona si els fitxers són grans.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud",
 "Name" => "Nom",
 "Size" => "Mida",
 "Modified" => "Modificat",
-"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetes"),
-"_%n file_::_%n files_" => array("%n fitxer","%n fitxers"),
 "%s could not be renamed" => "%s no es pot canviar el nom",
 "Upload" => "Puja",
 "File handling" => "Gestió de fitxers",
@@ -72,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor",
 "Files are being scanned, please wait." => "S'estan escanejant els fitxers, espereu",
 "Current scanning" => "Actualment escanejant",
-"directory" => "directori",
-"directories" => "directoris",
-"file" => "fitxer",
-"files" => "fitxers",
 "Upgrading filesystem cache..." => "Actualitzant la memòria de cau del sistema de fitxers..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 1f766de7cf6cdfff010ab5ea54d1d6c39e2af43a..c46758c7bcc211026a6f138b4333cbce8b20ecd6 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "zrušit",
 "replaced {new_name} with {old_name}" => "nahrazeno {new_name} s {old_name}",
 "undo" => "vrátit zpět",
+"_%n folder_::_%n folders_" => array("%n složka","%n složky","%n složek"),
+"_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"),
 "_Uploading %n file_::_Uploading %n files_" => array("Nahrávám %n soubor","Nahrávám %n soubory","Nahrávám %n souborů"),
 "files uploading" => "soubory se odesílají",
 "'.' is an invalid file name." => "'.' je neplatným názvem souboru.",
@@ -39,14 +41,11 @@ $TRANSLATIONS = array(
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.",
 "Your storage is full, files can not be updated or synced anymore!" => "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.",
 "Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložiště je téměř plné ({usedSpacePercent}%)",
-"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrování bylo zrušeno, soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde si složky odšifrujete.",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Š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.",
 "Your download is being prepared. This might take some time if the files are big." => "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neplatný název složky. Pojmenování 'Shared' je rezervováno pro vnitřní potřeby ownCloud",
 "Name" => "Název",
 "Size" => "Velikost",
 "Modified" => "Upraveno",
-"_%n folder_::_%n folders_" => array("%n složka","%n složky","%n složek"),
-"_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"),
 "%s could not be renamed" => "%s nemůže být přejmenován",
 "Upload" => "Odeslat",
 "File handling" => "Zacházení se soubory",
@@ -72,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.",
 "Files are being scanned, please wait." => "Soubory se prohledávají, prosím čekejte.",
 "Current scanning" => "Aktuální prohledávání",
-"directory" => "adresář",
-"directories" => "adresáře",
-"file" => "soubor",
-"files" => "soubory",
 "Upgrading filesystem cache..." => "Aktualizuji mezipaměť souborového systému..."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files/l10n/cy_GB.php b/apps/files/l10n/cy_GB.php
index 01c4613a8cead8cfac7606239c2f62653d1a422c..666e90e9db8416558f4330673ca888358e520e97 100644
--- a/apps/files/l10n/cy_GB.php
+++ b/apps/files/l10n/cy_GB.php
@@ -29,6 +29,8 @@ $TRANSLATIONS = array(
 "cancel" => "diddymu",
 "replaced {new_name} with {old_name}" => "newidiwyd {new_name} yn lle {old_name}",
 "undo" => "dadwneud",
+"_%n folder_::_%n folders_" => array("","","",""),
+"_%n file_::_%n files_" => array("","","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","","",""),
 "files uploading" => "ffeiliau'n llwytho i fyny",
 "'.' is an invalid file name." => "Mae '.' yn enw ffeil annilys.",
@@ -37,12 +39,9 @@ $TRANSLATIONS = array(
 "Your storage is full, files can not be updated or synced anymore!" => "Mae eich storfa'n llawn, ni ellir diweddaru a chydweddu ffeiliau mwyach!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Mae eich storfa bron a bod yn llawn ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Wrthi'n paratoi i lwytho i lawr. Gall gymryd peth amser os yw'r ffeiliau'n fawr.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Enw plygell annilys. Mae'r defnydd o 'Shared' yn cael ei gadw gan Owncloud",
 "Name" => "Enw",
 "Size" => "Maint",
 "Modified" => "Addaswyd",
-"_%n folder_::_%n folders_" => array("","","",""),
-"_%n file_::_%n files_" => array("","","",""),
 "Upload" => "Llwytho i fyny",
 "File handling" => "Trafod ffeiliau",
 "Maximum upload size" => "Maint mwyaf llwytho i fyny",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index e10b16be50e1d7d7494ab3e961123f913b5b5b2f..36703322f93736b596448752b170a274869919c5 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "fortryd",
 "replaced {new_name} with {old_name}" => "erstattede {new_name} med {old_name}",
 "undo" => "fortryd",
+"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
+"_%n file_::_%n files_" => array("%n fil","%n filer"),
 "_Uploading %n file_::_Uploading %n files_" => array("Uploader %n fil","Uploader %n filer"),
 "files uploading" => "uploader filer",
 "'.' is an invalid file name." => "'.' er et ugyldigt filnavn.",
@@ -41,12 +43,9 @@ $TRANSLATIONS = array(
 "Your storage is almost full ({usedSpacePercent}%)" => "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. GÃ¥ venligst til dine personlige indstillinger for at dekryptere dine filer. ",
 "Your download is being prepared. This might take some time if the files are big." => "Dit download forberedes. Dette kan tage lidt tid ved større filer.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud",
 "Name" => "Navn",
 "Size" => "Størrelse",
 "Modified" => "Ændret",
-"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
-"_%n file_::_%n files_" => array("%n fil","%n filer"),
 "%s could not be renamed" => "%s kunne ikke omdøbes",
 "Upload" => "Upload",
 "File handling" => "Filhåndtering",
@@ -72,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
 "Files are being scanned, please wait." => "Filerne bliver indlæst, vent venligst.",
 "Current scanning" => "Indlæser",
-"directory" => "mappe",
-"directories" => "Mapper",
-"file" => "fil",
-"files" => "filer",
 "Upgrading filesystem cache..." => "Opgraderer filsystems cachen..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index c41d2fb5c167a9b785ea46ac2add898c9898718c..8d8d30cb6e7973d6b2f599859a2c3c42b16fa803 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "abbrechen",
 "replaced {new_name} with {old_name}" => "{old_name} ersetzt durch {new_name}",
 "undo" => "rückgängig machen",
+"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
+"_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
 "_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hochgeladen","%n Dateien werden hochgeladen"),
 "files uploading" => "Dateien werden hoch geladen",
 "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
@@ -41,12 +43,9 @@ $TRANSLATIONS = array(
 "Your storage is almost full ({usedSpacePercent}%)" => "Dein Speicher ist fast voll ({usedSpacePercent}%)",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "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.",
 "Your download is being prepared. This might take some time if the files are big." => "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten.",
 "Name" => "Name",
 "Size" => "Größe",
 "Modified" => "Geändert",
-"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
-"_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
 "%s could not be renamed" => "%s konnte nicht umbenannt werden",
 "Upload" => "Hochladen",
 "File handling" => "Dateibehandlung",
@@ -72,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
 "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
 "Current scanning" => "Scanne",
-"directory" => "Verzeichnis",
-"directories" => "Verzeichnisse",
-"file" => "Datei",
-"files" => "Dateien",
 "Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 6d4bf8a4e7258bdf371a2f4114420fbd40b2f49a..309a885d37f4fbf34e12ac1a327c8847b5f2b3a4 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "abbrechen",
 "replaced {new_name} with {old_name}" => "{old_name} wurde ersetzt durch {new_name}",
 "undo" => "rückgängig machen",
+"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
+"_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
 "_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hoch geladen","%n Dateien werden hoch geladen"),
 "files uploading" => "Dateien werden hoch geladen",
 "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
@@ -41,12 +43,9 @@ $TRANSLATIONS = array(
 "Your storage is almost full ({usedSpacePercent}%)" => "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "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.",
 "Your download is being prepared. This might take some time if the files are big." => "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten",
 "Name" => "Name",
 "Size" => "Größe",
 "Modified" => "Geändert",
-"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
-"_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
 "%s could not be renamed" => "%s konnte nicht umbenannt werden",
 "Upload" => "Hochladen",
 "File handling" => "Dateibehandlung",
@@ -72,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
 "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
 "Current scanning" => "Scanne",
-"directory" => "Verzeichnis",
-"directories" => "Verzeichnisse",
-"file" => "Datei",
-"files" => "Dateien",
 "Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index e1d0052bc0be510cf1c1add2038ebc6410a39765..1dca8e41f6dbd9d0924522699d281a08e8805b36 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -32,20 +32,20 @@ $TRANSLATIONS = array(
 "cancel" => "ακύρωση",
 "replaced {new_name} with {old_name}" => "αντικαταστάθηκε το {new_name} με {old_name}",
 "undo" => "αναίρεση",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("%n φάκελος","%n φάκελοι"),
+"_%n file_::_%n files_" => array("%n αρχείο","%n αρχεία"),
+"_Uploading %n file_::_Uploading %n files_" => array("Ανέβασμα %n αρχείου","Ανέβασμα %n αρχείων"),
 "files uploading" => "αρχεία ανεβαίνουν",
 "'.' is an invalid file name." => "'.' είναι μη έγκυρο όνομα αρχείου.",
 "File name cannot be empty." => "Το όνομα αρχείου δεν μπορεί να είναι κενό.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται.",
 "Your storage is full, files can not be updated or synced anymore!" => "Ο αποθηκευτικός σας χώρος είναι γεμάτος, τα αρχεία δεν μπορούν να ενημερωθούν ή να συγχρονιστούν πια!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)",
+"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." => "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από ο Owncloud",
 "Name" => "Όνομα",
 "Size" => "Μέγεθος",
 "Modified" => "Τροποποιήθηκε",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "%s could not be renamed" => "Αδυναμία μετονομασίας του %s",
 "Upload" => "Μεταφόρτωση",
 "File handling" => "Διαχείριση αρχείων",
@@ -71,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.",
 "Files are being scanned, please wait." => "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε.",
 "Current scanning" => "Τρέχουσα ανίχνευση",
-"directory" => "κατάλογος",
-"directories" => "κατάλογοι",
-"file" => "αρχείο",
-"files" => "αρχεία",
 "Upgrading filesystem cache..." => "Ενημέρωση της μνήμης cache του συστήματος αρχείων..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/en@pirate.php b/apps/files/l10n/en@pirate.php
index 83351f265f09031629b06b63f476892adfdbb7af..128f527aef186c5afc9d7418d1ff130f10a9b22f 100644
--- a/apps/files/l10n/en@pirate.php
+++ b/apps/files/l10n/en@pirate.php
@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Download" => "Download"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index 0f404fa29fa250c9d37afc36320d0d7757ed3f97..2a011ab214b310153b5d9397670f04432452713c 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -30,6 +30,8 @@ $TRANSLATIONS = array(
 "cancel" => "nuligi",
 "replaced {new_name} with {old_name}" => "anstataŭiĝis {new_name} per {old_name}",
 "undo" => "malfari",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "dosieroj estas alŝutataj",
 "'.' is an invalid file name." => "'.' ne estas valida dosiernomo.",
@@ -38,12 +40,9 @@ $TRANSLATIONS = array(
 "Your storage is full, files can not be updated or synced anymore!" => "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Via memoro preskaÅ­ plenas ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Via elŝuto pretiĝatas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nevalida dosierujnomo. Uzo de “Shared” rezervatas de Owncloud.",
 "Name" => "Nomo",
 "Size" => "Grando",
 "Modified" => "Modifita",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "Alŝuti",
 "File handling" => "Dosieradministro",
 "Maximum upload size" => "Maksimuma alŝutogrando",
@@ -68,8 +67,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.",
 "Files are being scanned, please wait." => "Dosieroj estas skanataj, bonvolu atendi.",
 "Current scanning" => "Nuna skano",
-"file" => "dosiero",
-"files" => "dosieroj",
 "Upgrading filesystem cache..." => "Ĝisdatiĝas dosiersistema kaŝmemoro..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 2672b16954963437cf07c8eb68c435fcc0ced7de..1ff1506aaf4f92838d0032a1f7a4b131885a6e6b 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "cancelar",
 "replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}",
 "undo" => "deshacer",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "subiendo archivos",
 "'.' is an invalid file name." => "'.' no es un nombre de archivo válido.",
@@ -40,12 +42,9 @@ $TRANSLATIONS = array(
 "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}%)",
 "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.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nombre de carpeta no es válido. El uso de \"Shared\" está reservado por Owncloud",
 "Name" => "Nombre",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "%s could not be renamed" => "%s no se pudo renombrar",
 "Upload" => "Subir",
 "File handling" => "Manejo de archivos",
@@ -71,10 +70,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.",
 "Files are being scanned, please wait." => "Los archivos están siendo escaneados,  por favor espere.",
 "Current scanning" => "Escaneo actual",
-"directory" => "carpeta",
-"directories" => "carpetas",
-"file" => "archivo",
-"files" => "archivos",
 "Upgrading filesystem cache..." => "Actualizando caché del sistema de archivos"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index 5e94da3c437b8e10d0ebae10c58df26866f85cca..dac4d4e4de231412cc49b4800dbc6f7a011ffa73 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "cancelar",
 "replaced {new_name} with {old_name}" => "se reemplazó {new_name} con {old_name}",
 "undo" => "deshacer",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "Subiendo archivos",
 "'.' is an invalid file name." => "'.' es un nombre de archivo inválido.",
@@ -39,13 +41,11 @@ $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!" => "El almacenamiento está lleno, los archivos no se pueden seguir actualizando ni sincronizando",
 "Your storage is almost full ({usedSpacePercent}%)" => "El almacenamiento está casi lleno ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "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.",
 "Your download is being prepared. This might take some time if the files are big." => "Tu descarga se está preparando. Esto puede demorar si los archivos son muy grandes.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nombre de carpeta inválido. El uso de 'Shared' está reservado por ownCloud",
 "Name" => "Nombre",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "%s could not be renamed" => "No se pudo renombrar %s",
 "Upload" => "Subir",
 "File handling" => "Tratamiento de archivos",
@@ -71,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que intentás subir sobrepasan el tamaño máximo ",
 "Files are being scanned, please wait." => "Se están escaneando los archivos, por favor esperá.",
 "Current scanning" => "Escaneo actual",
-"directory" => "directorio",
-"directories" => "directorios",
-"file" => "archivo",
-"files" => "archivos",
 "Upgrading filesystem cache..." => "Actualizando el cache del sistema de archivos"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index 2a5016f38078c6b1020ef31c0649573a95b7dfee..e1947cb8f73d6ca405c3e135e1f126f8c406e9c9 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "loobu",
 "replaced {new_name} with {old_name}" => "asendas nime {old_name} nimega {new_name}",
 "undo" => "tagasi",
+"_%n folder_::_%n folders_" => array("%n kataloog","%n kataloogi"),
+"_%n file_::_%n files_" => array("%n fail","%n faili"),
 "_Uploading %n file_::_Uploading %n files_" => array("Laadin üles %n faili","Laadin üles %n faili"),
 "files uploading" => "faili üleslaadimisel",
 "'.' is an invalid file name." => "'.' on vigane failinimi.",
@@ -41,12 +43,9 @@ $TRANSLATIONS = array(
 "Your storage is almost full ({usedSpacePercent}%)" => "Su andmemaht on peaaegu täis ({usedSpacePercent}%)",
 "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. ",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Vigane kataloogi nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt.",
 "Name" => "Nimi",
 "Size" => "Suurus",
 "Modified" => "Muudetud",
-"_%n folder_::_%n folders_" => array("%n kataloog","%n kataloogi"),
-"_%n file_::_%n files_" => array("%n fail","%n faili"),
 "%s could not be renamed" => "%s ümbernimetamine ebaõnnestus",
 "Upload" => "Lae üles",
 "File handling" => "Failide käsitlemine",
@@ -72,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",
 "Files are being scanned, please wait." => "Faile skannitakse, palun oota.",
 "Current scanning" => "Praegune skannimine",
-"directory" => "kaust",
-"directories" => "kaustad",
-"file" => "fail",
-"files" => "faili",
 "Upgrading filesystem cache..." => "Failisüsteemi puhvri uuendamine..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 140261b6c156fc507cb1984ab0be772afb0e0d5e..6c6e92dda3898dc8c5e9be597314d9ba4dc66bab 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "ezeztatu",
 "replaced {new_name} with {old_name}" => " {new_name}-k {old_name} ordezkatu du",
 "undo" => "desegin",
+"_%n folder_::_%n folders_" => array("karpeta %n","%n karpeta"),
+"_%n file_::_%n files_" => array("fitxategi %n","%n fitxategi"),
 "_Uploading %n file_::_Uploading %n files_" => array("Fitxategi %n igotzen","%n fitxategi igotzen"),
 "files uploading" => "fitxategiak igotzen",
 "'.' is an invalid file name." => "'.' ez da fitxategi izen baliogarria.",
@@ -41,12 +43,9 @@ $TRANSLATIONS = array(
 "Your storage is almost full ({usedSpacePercent}%)" => "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Enkriptazioa desgaitua izan da baina zure fitxategiak oraindik enkriptatuta daude. Mesedez  jo zure ezarpen pertsonaletara zure fitxategiak dekodifikatzeko.",
 "Your download is being prepared. This might take some time if the files are big." => "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. ",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Baliogabeako karpeta izena. 'Shared' izena Owncloudek erreserbatzen du",
 "Name" => "Izena",
 "Size" => "Tamaina",
 "Modified" => "Aldatuta",
-"_%n folder_::_%n folders_" => array("karpeta %n","%n karpeta"),
-"_%n file_::_%n files_" => array("fitxategi %n","%n fitxategi"),
 "%s could not be renamed" => "%s ezin da berrizendatu",
 "Upload" => "Igo",
 "File handling" => "Fitxategien kudeaketa",
@@ -72,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
 "Files are being scanned, please wait." => "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
 "Current scanning" => "Orain eskaneatzen ari da",
-"directory" => "direktorioa",
-"directories" => "direktorioak",
-"file" => "fitxategia",
-"files" => "fitxategiak",
 "Upgrading filesystem cache..." => "Fitxategi sistemaren katxea eguneratzen..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 96332921cff90ab9f1b4ad6af8f4c9349652cee0..afa04e53ab25a5162dc7308240d00984ab64bc17 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "لغو",
 "replaced {new_name} with {old_name}" => "{نام_جدید} با { نام_قدیمی} جایگزین شد.",
 "undo" => "بازگشت",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "بارگذاری فایل ها",
 "'.' is an invalid file name." => "'.'   یک نام پرونده نامعتبر است.",
@@ -40,12 +42,9 @@ $TRANSLATIONS = array(
 "Your storage is full, files can not be updated or synced anymore!" => "فضای ذخیره ی شما کاملا پر است، بیش از این فایلها بهنگام یا همگام سازی نمی توانند بشوند!",
 "Your storage is almost full ({usedSpacePercent}%)" => "فضای ذخیره ی شما تقریبا پر است ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "نام پوشه نامعتبر است. استفاده از \" به اشتراک گذاشته شده \" متعلق به سایت Owncloud است.",
 "Name" => "نام",
 "Size" => "اندازه",
 "Modified" => "تاریخ",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "%s could not be renamed" => "%s نمیتواند تغییر نام دهد.",
 "Upload" => "بارگزاری",
 "File handling" => "اداره پرونده ها",
@@ -71,10 +70,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",
 "Files are being scanned, please wait." => "پرونده ها در حال بازرسی هستند لطفا صبر کنید",
 "Current scanning" => "بازرسی کنونی",
-"directory" => "پوشه",
-"directories" => "پوشه ها",
-"file" => "پرونده",
-"files" => "پرونده ها",
 "Upgrading filesystem cache..." => "بهبود فایل سیستمی ذخیره گاه..."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index b48f44665bc282e9a164fac4d22127f0460e0c1e..d18ff4f0207e9158c716789f39275c2da822c6d7 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -28,6 +28,8 @@ $TRANSLATIONS = array(
 "suggest name" => "ehdota nimeä",
 "cancel" => "peru",
 "undo" => "kumoa",
+"_%n folder_::_%n folders_" => array("%n kansio","%n kansiota"),
+"_%n file_::_%n files_" => array("%n tiedosto","%n tiedostoa"),
 "_Uploading %n file_::_Uploading %n files_" => array("Lähetetään %n tiedosto","Lähetetään %n tiedostoa"),
 "'.' is an invalid file name." => "'.' on virheellinen nimi tiedostolle.",
 "File name cannot be empty." => "Tiedoston nimi ei voi olla tyhjä.",
@@ -38,8 +40,6 @@ $TRANSLATIONS = array(
 "Name" => "Nimi",
 "Size" => "Koko",
 "Modified" => "Muokattu",
-"_%n folder_::_%n folders_" => array("%n kansio","%n kansiota"),
-"_%n file_::_%n files_" => array("%n tiedosto","%n tiedostoa"),
 "Upload" => "Lähetä",
 "File handling" => "Tiedostonhallinta",
 "Maximum upload size" => "Lähetettävän tiedoston suurin sallittu koko",
@@ -64,10 +64,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.",
 "Files are being scanned, please wait." => "Tiedostoja tarkistetaan, odota hetki.",
 "Current scanning" => "Tämänhetkinen tutkinta",
-"directory" => "kansio",
-"directories" => "kansiota",
-"file" => "tiedosto",
-"files" => "tiedostoa",
 "Upgrading filesystem cache..." => "Päivitetään tiedostojärjestelmän välimuistia..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 6006413449842bcfee768bbcf91c088898946d20..40bb81296e66f087c15436fdea4552abe87f1738 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "annuler",
 "replaced {new_name} with {old_name}" => "{new_name} a été remplacé par {old_name}",
 "undo" => "annuler",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "fichiers en cours d'envoi",
 "'.' is an invalid file name." => "'.' n'est pas un nom de fichier valide.",
@@ -40,12 +42,9 @@ $TRANSLATIONS = array(
 "Your storage is full, files can not be updated or synced anymore!" => "Votre espage de stockage est plein, les fichiers ne peuvent plus être téléversés ou synchronisés !",
 "Your storage is almost full ({usedSpacePercent}%)" => "Votre espace de stockage est presque plein ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud",
 "Name" => "Nom",
 "Size" => "Taille",
 "Modified" => "Modifié",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "%s could not be renamed" => "%s ne peut être renommé",
 "Upload" => "Envoyer",
 "File handling" => "Gestion des fichiers",
@@ -71,10 +70,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur.",
 "Files are being scanned, please wait." => "Les fichiers sont en cours d'analyse, veuillez patienter.",
 "Current scanning" => "Analyse en cours",
-"directory" => "dossier",
-"directories" => "dossiers",
-"file" => "fichier",
-"files" => "fichiers",
 "Upgrading filesystem cache..." => "Mise à niveau du cache du système de fichier"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index 98274ed751a94fc1f60c8ba7d29e8f7b9c9fe4dd..2df738cb15f224f38fe2f46e428cb27b1da05599 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "cancelar",
 "replaced {new_name} with {old_name}" => "substituír {new_name} por {old_name}",
 "undo" => "desfacer",
+"_%n folder_::_%n folders_" => array("%n cartafol","%n cartafoles"),
+"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
 "_Uploading %n file_::_Uploading %n files_" => array("Cargando %n ficheiro","Cargando %n ficheiros"),
 "files uploading" => "ficheiros enviándose",
 "'.' is an invalid file name." => "«.» é un nome de ficheiro incorrecto",
@@ -41,12 +43,9 @@ $TRANSLATIONS = array(
 "Your storage is almost full ({usedSpacePercent}%)" => "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "O cifrado foi desactivado, mais os ficheiros están cifrados. Vaia á configuración persoal para descifrar os ficheiros.",
 "Your download is being prepared. This might take some time if the files are big." => "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nome de cartafol incorrecto. O uso de «Shared» está reservado por Owncloud",
 "Name" => "Nome",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
-"_%n folder_::_%n folders_" => array("%n cartafol","%n cartafoles"),
-"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
 "%s could not be renamed" => "%s non pode cambiar de nome",
 "Upload" => "Enviar",
 "File handling" => "Manexo de ficheiro",
@@ -72,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor",
 "Files are being scanned, please wait." => "Estanse analizando os ficheiros. Agarde.",
 "Current scanning" => "Análise actual",
-"directory" => "directorio",
-"directories" => "directorios",
-"file" => "ficheiro",
-"files" => "ficheiros",
 "Upgrading filesystem cache..." => "Anovando a caché do sistema de ficheiros..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index ef98e2d2188fd2c46ff41ece7aec0efe4dbd250c..7141c8442e22bdf20216837d05c2f5a5155fb0ed 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -28,14 +28,14 @@ $TRANSLATIONS = array(
 "cancel" => "ביטול",
 "replaced {new_name} with {old_name}" => "{new_name} הוחלף ב־{old_name}",
 "undo" => "ביטול",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "קבצים בהעלאה",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'.",
 "Name" => "שם",
 "Size" => "גודל",
 "Modified" => "זמן שינוי",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "העלאה",
 "File handling" => "טיפול בקבצים",
 "Maximum upload size" => "גודל העלאה מקסימלי",
@@ -57,8 +57,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "העלאה גדולה מידי",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה.",
 "Files are being scanned, please wait." => "הקבצים נסרקים, נא להמתין.",
-"Current scanning" => "הסריקה הנוכחית",
-"file" => "קובץ",
-"files" => "קבצים"
+"Current scanning" => "הסריקה הנוכחית"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/hi.php b/apps/files/l10n/hi.php
index 7fb5a5b09d3c98629a280914bab27f3295451256..7d2baab607dd17182c2c13f939a5fc623beb4112 100644
--- a/apps/files/l10n/hi.php
+++ b/apps/files/l10n/hi.php
@@ -2,9 +2,9 @@
 $TRANSLATIONS = array(
 "Error" => "त्रुटि",
 "Share" => "साझा करें",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Save" => "सहेजें"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index 8f74dea092f0bd332e108cbc3ca1295cc182c7e9..57f1ad9700bc321218345305793d9768d38a0242 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -18,13 +18,13 @@ $TRANSLATIONS = array(
 "suggest name" => "predloži ime",
 "cancel" => "odustani",
 "undo" => "vrati",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "files uploading" => "datoteke se učitavaju",
 "Name" => "Ime",
 "Size" => "Veličina",
 "Modified" => "Zadnja promjena",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
 "Upload" => "Učitaj",
 "File handling" => "datoteka za rukovanje",
 "Maximum upload size" => "Maksimalna veličina prijenosa",
@@ -45,8 +45,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Prijenos je preobiman",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju.",
 "Files are being scanned, please wait." => "Datoteke se skeniraju, molimo pričekajte.",
-"Current scanning" => "Trenutno skeniranje",
-"file" => "datoteka",
-"files" => "datoteke"
+"Current scanning" => "Trenutno skeniranje"
 );
 $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/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index 63efe031da87dcb754baa4eb10ddb385754ad418..741964503ffc6d740edc946fe7b4d3db5bee5d78 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "mégse",
 "replaced {new_name} with {old_name}" => "{new_name} fájlt kicseréltük ezzel:  {old_name}",
 "undo" => "visszavonás",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "fájl töltődik föl",
 "'.' is an invalid file name." => "'.' fájlnév érvénytelen.",
@@ -40,12 +42,9 @@ $TRANSLATIONS = array(
 "Your storage is full, files can not be updated or synced anymore!" => "A tároló tele van, a fájlok nem frissíthetőek vagy szinkronizálhatóak a jövőben.",
 "Your storage is almost full ({usedSpacePercent}%)" => "A tároló majdnem tele van ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Érvénytelen mappanév. A név használata csak a Owncloud számára lehetséges.",
 "Name" => "Név",
 "Size" => "Méret",
 "Modified" => "Módosítva",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "%s could not be renamed" => "%s átnevezése nem sikerült",
 "Upload" => "Feltöltés",
 "File handling" => "Fájlkezelés",
@@ -71,10 +70,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.",
 "Files are being scanned, please wait." => "A fájllista ellenőrzése zajlik, kis türelmet!",
 "Current scanning" => "Ellenőrzés alatt",
-"directory" => "mappa",
-"directories" => "mappa",
-"file" => "fájl",
-"files" => "fájlok",
 "Upgrading filesystem cache..." => "A fájlrendszer gyorsítótárának frissítése zajlik..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/hy.php b/apps/files/l10n/hy.php
index a419a74cc972b362f7b5cc20be7c7796e8656a2c..9a5ebb862a9f150acb2fbb4c1a9c4ba170136fdc 100644
--- a/apps/files/l10n/hy.php
+++ b/apps/files/l10n/hy.php
@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Save" => "ÕŠÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬",
 "Download" => "Ô²Õ¥Õ¼Õ¶Õ¥Õ¬",
 "Delete" => "Õ‹Õ¶Õ»Õ¥Õ¬"
diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php
index 202375636a1ea638be137b8be71c06e94b956178..1560687f6c4e646a9ba845b923ae213a56971d3c 100644
--- a/apps/files/l10n/ia.php
+++ b/apps/files/l10n/ia.php
@@ -6,12 +6,12 @@ $TRANSLATIONS = array(
 "Files" => "Files",
 "Error" => "Error",
 "Share" => "Compartir",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Name" => "Nomine",
 "Size" => "Dimension",
 "Modified" => "Modificate",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "Incargar",
 "Maximum upload size" => "Dimension maxime de incargamento",
 "Save" => "Salveguardar",
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index 0f7aac5a228fe1cc820b491bd31388b6d16578e3..ce7cfe5ef4cc26478762f7819f559a931928b9e7 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -29,6 +29,8 @@ $TRANSLATIONS = array(
 "cancel" => "batalkan",
 "replaced {new_name} with {old_name}" => "mengganti {new_name} dengan {old_name}",
 "undo" => "urungkan",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "berkas diunggah",
 "'.' is an invalid file name." => "'.' bukan nama berkas yang valid.",
@@ -37,12 +39,9 @@ $TRANSLATIONS = array(
 "Your storage is full, files can not be updated or synced anymore!" => "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkronkan lagi!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nama folder salah. Nama 'Shared' telah digunakan oleh Owncloud.",
 "Name" => "Nama",
 "Size" => "Ukuran",
 "Modified" => "Dimodifikasi",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "Upload" => "Unggah",
 "File handling" => "Penanganan berkas",
 "Maximum upload size" => "Ukuran pengunggahan maksimum",
@@ -67,8 +66,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.",
 "Files are being scanned, please wait." => "Berkas sedang dipindai, silakan tunggu.",
 "Current scanning" => "Yang sedang dipindai",
-"file" => "berkas",
-"files" => "berkas-berkas",
 "Upgrading filesystem cache..." => "Meningkatkan tembolok sistem berkas..."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php
index aee213691e01458c39e02957cc4df25979a2f3ef..2cf195d0a113adea0c425eca0228fa5fbfb2ebad 100644
--- a/apps/files/l10n/is.php
+++ b/apps/files/l10n/is.php
@@ -27,16 +27,15 @@ $TRANSLATIONS = array(
 "cancel" => "hætta við",
 "replaced {new_name} with {old_name}" => "yfirskrifaði {new_name} með {old_name}",
 "undo" => "afturkalla",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "'.' is an invalid file name." => "'.' er ekki leyfilegt nafn.",
 "File name cannot be empty." => "Nafn skráar má ekki vera tómt",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Óleyfilegt nafn á möppu. Nafnið 'Shared' er frátekið fyrir Owncloud",
 "Name" => "Nafn",
 "Size" => "Stærð",
 "Modified" => "Breytt",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "Senda inn",
 "File handling" => "Meðhöndlun skrár",
 "Maximum upload size" => "Hámarks stærð innsendingar",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 433234651639831944120de274e982f060b66293..2d53da2160460934b4eba0095d8a9d5cb632c3c6 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "annulla",
 "replaced {new_name} with {old_name}" => "sostituito {new_name} con {old_name}",
 "undo" => "annulla",
+"_%n folder_::_%n folders_" => array("%n cartella","%n cartelle"),
+"_%n file_::_%n files_" => array("%n file","%n file"),
 "_Uploading %n file_::_Uploading %n files_" => array("Caricamento di %n file in corso","Caricamento di %n file in corso"),
 "files uploading" => "caricamento file",
 "'.' is an invalid file name." => "'.' non è un nome file valido.",
@@ -41,12 +43,9 @@ $TRANSLATIONS = array(
 "Your storage is almost full ({usedSpacePercent}%)" => "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "La cifratura è stata disabilitata ma i tuoi file sono ancora cifrati. Vai nelle impostazioni personali per decifrare i file.",
 "Your download is being prepared. This might take some time if the files are big." => "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nome della cartella non valido. L'uso di 'Shared' è riservato da ownCloud",
 "Name" => "Nome",
 "Size" => "Dimensione",
 "Modified" => "Modificato",
-"_%n folder_::_%n folders_" => array("%n cartella","%n cartelle"),
-"_%n file_::_%n files_" => array("%n file","%n file"),
 "%s could not be renamed" => "%s non può essere rinominato",
 "Upload" => "Carica",
 "File handling" => "Gestione file",
@@ -72,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "I file che stai provando a caricare superano la dimensione massima consentita su questo server.",
 "Files are being scanned, please wait." => "Scansione dei file in corso, attendi",
 "Current scanning" => "Scansione corrente",
-"directory" => "cartella",
-"directories" => "cartelle",
-"file" => "file",
-"files" => "file",
 "Upgrading filesystem cache..." => "Aggiornamento della cache del filesystem in corso..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 2d64212a5f2df3e99100027a8f7ad74567bb674b..09675b63f51fab2ff184358c29ace1f5a45f578a 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "キャンセル",
 "replaced {new_name} with {old_name}" => "{old_name} を {new_name} に置換",
 "undo" => "元に戻す",
+"_%n folder_::_%n folders_" => array("%n個のフォルダ"),
+"_%n file_::_%n files_" => array("%n個のファイル"),
 "_Uploading %n file_::_Uploading %n files_" => array("%n 個のファイルをアップロード中"),
 "files uploading" => "ファイルをアップロード中",
 "'.' is an invalid file name." => "'.' は無効なファイル名です。",
@@ -41,12 +43,9 @@ $TRANSLATIONS = array(
 "Your storage is almost full ({usedSpacePercent}%)" => "あなたのストレージはほぼ一杯です（{usedSpacePercent}%）",
 "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." => "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "無効なフォルダ名です。'Shared' の利用は ownCloud が予約済みです。",
 "Name" => "名前",
 "Size" => "サイズ",
 "Modified" => "変更",
-"_%n folder_::_%n folders_" => array("%n個のフォルダ"),
-"_%n file_::_%n files_" => array("%n個のファイル"),
 "%s could not be renamed" => "%sの名前を変更できませんでした",
 "Upload" => "アップロード",
 "File handling" => "ファイル操作",
@@ -72,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。",
 "Files are being scanned, please wait." => "ファイルをスキャンしています、しばらくお待ちください。",
 "Current scanning" => "スキャン中",
-"directory" => "ディレクトリ",
-"directories" => "ディレクトリ",
-"file" => "ファイル",
-"files" => "ファイル",
 "Upgrading filesystem cache..." => "ファイルシステムキャッシュを更新中..."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ka.php b/apps/files/l10n/ka.php
index 527a2c49b1cc3446cfc2816d1e69303dea949c36..544e8168c548e6d5351f06ccd90428a0748f4e06 100644
--- a/apps/files/l10n/ka.php
+++ b/apps/files/l10n/ka.php
@@ -1,9 +1,9 @@
 <?php
 $TRANSLATIONS = array(
 "Files" => "ფაილები",
-"_Uploading %n file_::_Uploading %n files_" => array(""),
 "_%n folder_::_%n folders_" => array(""),
 "_%n file_::_%n files_" => array(""),
+"_Uploading %n file_::_Uploading %n files_" => array(""),
 "Download" => "გადმოწერა"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php
index 3205255e39fbea9c06ce442ba7a8bcba41c09e80..8fd522aebcc1c6ea25a8dda828a872de920690f2 100644
--- a/apps/files/l10n/ka_GE.php
+++ b/apps/files/l10n/ka_GE.php
@@ -29,6 +29,8 @@ $TRANSLATIONS = array(
 "cancel" => "უარყოფა",
 "replaced {new_name} with {old_name}" => "{new_name} შეცვლილია {old_name}–ით",
 "undo" => "დაბრუნება",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "ფაილები იტვირთება",
 "'.' is an invalid file name." => "'.' არის დაუშვებელი ფაილის სახელი.",
@@ -37,12 +39,9 @@ $TRANSLATIONS = array(
 "Your storage is full, files can not be updated or synced anymore!" => "თქვენი საცავი გადაივსო. ფაილების განახლება და სინქრონიზირება ვერ მოხერხდება!",
 "Your storage is almost full ({usedSpacePercent}%)" => "თქვენი საცავი თითქმის გადაივსო ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "გადმოწერის მოთხოვნა მუშავდება. ის მოითხოვს გარკვეულ დროს რაგდან ფაილები არის დიდი ზომის.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "დაუშვებელი ფოლდერის სახელი.  'Shared'–ის გამოყენება რეზერვირებულია Owncloud–ის მიერ",
 "Name" => "სახელი",
 "Size" => "ზომა",
 "Modified" => "შეცვლილია",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "Upload" => "ატვირთვა",
 "File handling" => "ფაილის დამუშავება",
 "Maximum upload size" => "მაქსიმუმ ატვირთის ზომა",
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index 7839ad3bd936c906f822d880a71e0ba0e1e18d53..86666c705695748781967ab9e137c92b1fd3ad58 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -29,6 +29,8 @@ $TRANSLATIONS = array(
 "cancel" => "취소",
 "replaced {new_name} with {old_name}" => "{old_name}이(가) {new_name}(으)로 대체됨",
 "undo" => "되돌리기",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "파일 업로드중",
 "'.' is an invalid file name." => "'.' 는 올바르지 않은 파일 이름 입니다.",
@@ -37,12 +39,9 @@ $TRANSLATIONS = array(
 "Your storage is full, files can not be updated or synced anymore!" => "저장 공간이 가득 찼습니다. 파일을 업데이트하거나 동기화할 수 없습니다!",
 "Your storage is almost full ({usedSpacePercent}%)" => "저장 공간이 거의 가득 찼습니다 ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "다운로드가 준비 중입니다. 파일 크기가 크다면 시간이 오래 걸릴 수도 있습니다.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "폴더 이름이 유효하지 않습니다. ",
 "Name" => "이름",
 "Size" => "크기",
 "Modified" => "수정됨",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "Upload" => "업로드",
 "File handling" => "파일 처리",
 "Maximum upload size" => "최대 업로드 크기",
@@ -67,8 +66,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다.",
 "Files are being scanned, please wait." => "파일을 검색하고 있습니다. 기다려 주십시오.",
 "Current scanning" => "현재 검색",
-"file" => "파일",
-"files" => "파일",
 "Upgrading filesystem cache..." => "파일 시스템 캐시 업그레이드 중..."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ku_IQ.php b/apps/files/l10n/ku_IQ.php
index 81177f9bea07221749f112997e332ad5e91a1dce..9ec565da441e76146bf78f6b7dc0346b25b397bb 100644
--- a/apps/files/l10n/ku_IQ.php
+++ b/apps/files/l10n/ku_IQ.php
@@ -2,10 +2,10 @@
 $TRANSLATIONS = array(
 "URL cannot be empty." => "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت.",
 "Error" => "هه‌ڵه",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Name" => "ناو",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"Name" => "ناو",
 "Upload" => "بارکردن",
 "Save" => "پاشکه‌وتکردن",
 "Folder" => "بوخچه",
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index c57eebd9e765fed8e90f8e91f4778dcf1359bf32..deefe9caa1574b16e32bf5e39181aecc7a9422cc 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -15,12 +15,12 @@ $TRANSLATIONS = array(
 "replace" => "ersetzen",
 "cancel" => "ofbriechen",
 "undo" => "réckgängeg man",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Name" => "Numm",
 "Size" => "Gréisst",
 "Modified" => "Geännert",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "Eroplueden",
 "File handling" => "Fichier handling",
 "Maximum upload size" => "Maximum Upload Gréisst ",
@@ -41,8 +41,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Upload ze grouss",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "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.",
 "Files are being scanned, please wait." => "Fichieren gi gescannt, war weg.",
-"Current scanning" => "Momentane Scan",
-"file" => "Datei",
-"files" => "Dateien"
+"Current scanning" => "Momentane Scan"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index cae9660ab66e7ebaf3467869a9690521911dc55e..3bcc6b8443992020293abb1d812679702206f084 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -30,6 +30,8 @@ $TRANSLATIONS = array(
 "cancel" => "atšaukti",
 "replaced {new_name} with {old_name}" => "pakeiskite {new_name} į {old_name}",
 "undo" => "anuliuoti",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "files uploading" => "įkeliami failai",
 "'.' is an invalid file name." => "'.' yra neleidžiamas failo pavadinime.",
@@ -38,12 +40,9 @@ $TRANSLATIONS = array(
 "Your storage is full, files can not be updated or synced anymore!" => "Jūsų visa vieta serveryje užimta",
 "Your storage is almost full ({usedSpacePercent}%)" => "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Jūsų atsisiuntimas yra paruošiamas. tai gali užtrukti jei atsisiunčiamas didelis failas.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud",
 "Name" => "Pavadinimas",
 "Size" => "Dydis",
 "Modified" => "Pakeista",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
 "Upload" => "Įkelti",
 "File handling" => "Failų tvarkymas",
 "Maximum upload size" => "Maksimalus įkeliamo failo dydis",
@@ -68,8 +67,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje",
 "Files are being scanned, please wait." => "Skenuojami failai, prašome palaukti.",
 "Current scanning" => "Å iuo metu skenuojama",
-"file" => "failas",
-"files" => "failai",
 "Upgrading filesystem cache..." => "Atnaujinamas sistemos kešavimas..."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index 9367b0f5a640a7c364c97560c81ce6db471e6488..52cea5305d091b833c27a8685aa051c91c7f1612 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "atcelt",
 "replaced {new_name} with {old_name}" => "aizvietoja {new_name} ar {old_name}",
 "undo" => "atsaukt",
+"_%n folder_::_%n folders_" => array("%n mapes","%n mape","%n mapes"),
+"_%n file_::_%n files_" => array("%n faili","%n fails","%n faili"),
 "_Uploading %n file_::_Uploading %n files_" => array("%n","Augšupielāde %n failu","Augšupielāde %n failus"),
 "files uploading" => "fails augšupielādējas",
 "'.' is an invalid file name." => "'.' ir nederīgs datnes nosaukums.",
@@ -41,12 +43,9 @@ $TRANSLATIONS = array(
 "Your storage is almost full ({usedSpacePercent}%)" => "Jūsu krātuve ir gandrīz pilna ({usedSpacePercent}%)",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrēšana tika atslēgta, tomēr jūsu faili joprojām ir šifrēti. Atšifrēt failus var Personiskajos uzstādījumos.",
 "Your download is being prepared. This might take some time if the files are big." => "Tiek sagatavota lejupielāde. Tas var aizņemt kādu laiciņu, ja datnes ir lielas.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nederīgs mapes nosaukums. “Koplietots” izmantojums ir rezervēts ownCloud servisam.",
 "Name" => "Nosaukums",
 "Size" => "Izmērs",
 "Modified" => "Mainīts",
-"_%n folder_::_%n folders_" => array("%n mapes","%n mape","%n mapes"),
-"_%n file_::_%n files_" => array("%n faili","%n fails","%n faili"),
 "%s could not be renamed" => "%s nevar tikt pārsaukts",
 "Upload" => "Augšupielādēt",
 "File handling" => "Datņu pārvaldība",
@@ -72,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu",
 "Files are being scanned, please wait." => "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet.",
 "Current scanning" => "Šobrīd tiek caurskatīts",
-"directory" => "direktorija",
-"directories" => "direktorijas",
-"file" => "fails",
-"files" => "faili",
 "Upgrading filesystem cache..." => "Uzlabo datņu sistēmas kešatmiņu..."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index 20fed43ab20eda052ce74f16776f44bbfe278266..7a9a8641f8082e69ecdf028a932c4b84b732a871 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -23,13 +23,13 @@ $TRANSLATIONS = array(
 "cancel" => "откажи",
 "replaced {new_name} with {old_name}" => "заменета {new_name} со {old_name}",
 "undo" => "врати",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени.",
 "Name" => "Име",
 "Size" => "Големина",
 "Modified" => "Променето",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "Подигни",
 "File handling" => "Ракување со датотеки",
 "Maximum upload size" => "Максимална големина за подигање",
@@ -51,8 +51,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Фајлот кој се вчитува е преголем",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер.",
 "Files are being scanned, please wait." => "Се скенираат датотеки, ве молам почекајте.",
-"Current scanning" => "Моментално скенирам",
-"file" => "датотека",
-"files" => "датотеки"
+"Current scanning" => "Моментално скенирам"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index 86b70faefda3b07a977c4f8b768e655dc43fb72c..59d0bbfb339e710032edb1777d8d2ffef019ae66 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -15,12 +15,12 @@ $TRANSLATIONS = array(
 "Pending" => "Dalam proses",
 "replace" => "ganti",
 "cancel" => "Batal",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
 "Name" => "Nama",
 "Size" => "Saiz",
 "Modified" => "Dimodifikasi",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "Upload" => "Muat naik",
 "File handling" => "Pengendalian fail",
 "Maximum upload size" => "Saiz maksimum muat naik",
@@ -40,8 +40,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Muatnaik terlalu besar",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server",
 "Files are being scanned, please wait." => "Fail sedang diimbas, harap bersabar.",
-"Current scanning" => "Imbasan semasa",
-"file" => "fail",
-"files" => "fail"
+"Current scanning" => "Imbasan semasa"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/my_MM.php b/apps/files/l10n/my_MM.php
index 4dc63ffee2d7b03637e751ca3e61c686c9810786..497ecc0949250ba65a5512e9fed53b5484a4f244 100644
--- a/apps/files/l10n/my_MM.php
+++ b/apps/files/l10n/my_MM.php
@@ -1,9 +1,9 @@
 <?php
 $TRANSLATIONS = array(
 "Files" => "ဖိုင်များ",
-"_Uploading %n file_::_Uploading %n files_" => array(""),
 "_%n folder_::_%n folders_" => array(""),
 "_%n file_::_%n files_" => array(""),
+"_Uploading %n file_::_Uploading %n files_" => array(""),
 "Download" => "ဒေါင်းလုတ်"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index d76255f522db517ab83b432004c0c395c7163306..5c7780825fbe658e9350a08e8a3b21c9d43b9503 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "avbryt",
 "replaced {new_name} with {old_name}" => "erstattet {new_name} med {old_name}",
 "undo" => "angre",
+"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
+"_%n file_::_%n files_" => array("%n fil","%n filer"),
 "_Uploading %n file_::_Uploading %n files_" => array("Laster opp %n fil","Laster opp %n filer"),
 "files uploading" => "filer lastes opp",
 "'.' is an invalid file name." => "'.' er et ugyldig filnavn.",
@@ -40,12 +42,9 @@ $TRANSLATIONS = array(
 "Your storage is full, files can not be updated or synced anymore!" => "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud.",
 "Name" => "Navn",
 "Size" => "Størrelse",
 "Modified" => "Endret",
-"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
-"_%n file_::_%n files_" => array("%n fil","%n filer"),
 "%s could not be renamed" => "Kunne ikke gi nytt navn til %s",
 "Upload" => "Last opp",
 "File handling" => "Filhåndtering",
@@ -71,10 +70,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",
 "Files are being scanned, please wait." => "Skanner filer, vennligst vent.",
 "Current scanning" => "Pågående skanning",
-"directory" => "katalog",
-"directories" => "kataloger",
-"file" => "fil",
-"files" => "filer",
 "Upgrading filesystem cache..." => "Oppgraderer filsystemets  mellomlager..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 6e9ff605f504d01d022e76f98e02cb6f20e9eeeb..a4386992cf67cfc4e3133b9284ab654d3dbcd647 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "annuleren",
 "replaced {new_name} with {old_name}" => "verving {new_name} met {old_name}",
 "undo" => "ongedaan maken",
+"_%n folder_::_%n folders_" => array("","%n mappen"),
+"_%n file_::_%n files_" => array("","%n bestanden"),
 "_Uploading %n file_::_Uploading %n files_" => array("%n bestand aan het uploaden","%n bestanden aan het uploaden"),
 "files uploading" => "bestanden aan het uploaden",
 "'.' is an invalid file name." => "'.' is een ongeldige bestandsnaam.",
@@ -41,12 +43,9 @@ $TRANSLATIONS = array(
 "Your storage is almost full ({usedSpacePercent}%)" => "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)",
 "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.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud",
 "Name" => "Naam",
 "Size" => "Grootte",
 "Modified" => "Aangepast",
-"_%n folder_::_%n folders_" => array("","%n mappen"),
-"_%n file_::_%n files_" => array("","%n bestanden"),
 "%s could not be renamed" => "%s kon niet worden hernoemd",
 "Upload" => "Uploaden",
 "File handling" => "Bestand",
@@ -72,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane  bestandsgrootte voor deze server.",
 "Files are being scanned, please wait." => "Bestanden worden gescand, even wachten.",
 "Current scanning" => "Er wordt gescand",
-"directory" => "directory",
-"directories" => "directories",
-"file" => "bestand",
-"files" => "bestanden",
 "Upgrading filesystem cache..." => "Upgraden bestandssysteem cache..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index 0f0ad318740fd5447863eb2bab183f522b52d58e..84402057a3a3fcb5ce8dc0dfb2c466d20b7f2ad5 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -30,6 +30,8 @@ $TRANSLATIONS = array(
 "cancel" => "avbryt",
 "replaced {new_name} with {old_name}" => "bytte ut {new_name} med {old_name}",
 "undo" => "angre",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "filer lastar opp",
 "'.' is an invalid file name." => "«.» er eit ugyldig filnamn.",
@@ -38,12 +40,9 @@ $TRANSLATIONS = array(
 "Your storage is full, files can not be updated or synced anymore!" => "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Lagringa di er nesten full ({usedSpacePercent} %)",
 "Your download is being prepared. This might take some time if the files are big." => "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud",
 "Name" => "Namn",
 "Size" => "Storleik",
 "Modified" => "Endra",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "Last opp",
 "File handling" => "Filhandtering",
 "Maximum upload size" => "Maksimal opplastingsstorleik",
diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php
index 552d72bef59cfa1ff15a2a6b7db4f711fae4827a..63e572059bf8cc4e663be208f989057d9b1bc1c7 100644
--- a/apps/files/l10n/oc.php
+++ b/apps/files/l10n/oc.php
@@ -18,13 +18,13 @@ $TRANSLATIONS = array(
 "suggest name" => "nom prepausat",
 "cancel" => "anulla",
 "undo" => "defar",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "fichièrs al amontcargar",
 "Name" => "Nom",
 "Size" => "Talha",
 "Modified" => "Modificat",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "Amontcarga",
 "File handling" => "Manejament de fichièr",
 "Maximum upload size" => "Talha maximum d'amontcargament",
@@ -45,8 +45,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Amontcargament tròp gròs",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor.",
 "Files are being scanned, please wait." => "Los fiichièrs son a èsser explorats, ",
-"Current scanning" => "Exploracion en cors",
-"file" => "fichièr",
-"files" => "fichièrs"
+"Current scanning" => "Exploracion en cors"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index 813d2ee8e7c5f3844b23093dcc0719a86ee116fd..c55d81cea2ffdae3ac29687751c8286614fb916e 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "anuluj",
 "replaced {new_name} with {old_name}" => "zastÄ…piono {new_name} przez {old_name}",
 "undo" => "cofnij",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "files uploading" => "pliki wczytane",
 "'.' is an invalid file name." => "„.” jest nieprawidłową nazwą pliku.",
@@ -40,12 +42,9 @@ $TRANSLATIONS = array(
 "Your storage is full, files can not be updated or synced anymore!" => "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Twój magazyn jest prawie pełny ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nieprawidłowa nazwa folderu. Korzystanie z nazwy „Shared” jest zarezerwowane dla ownCloud",
 "Name" => "Nazwa",
 "Size" => "Rozmiar",
 "Modified" => "Modyfikacja",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
 "%s could not be renamed" => "%s nie można zmienić nazwy",
 "Upload" => "Wyślij",
 "File handling" => "ZarzÄ…dzanie plikami",
@@ -71,10 +70,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość.",
 "Files are being scanned, please wait." => "Skanowanie plików, proszę czekać.",
 "Current scanning" => "Aktualnie skanowane",
-"directory" => "Katalog",
-"directories" => "Katalogi",
-"file" => "plik",
-"files" => "pliki",
 "Upgrading filesystem cache..." => "Uaktualnianie plików pamięci podręcznej..."
 );
 $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/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index 575df89111497424b76505f2380c967ef28b9f31..bfe34bab21fba33622d59c2f6f352404e1508799 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "cancelar",
 "replaced {new_name} with {old_name}" => "Substituído {old_name} por {new_name} ",
 "undo" => "desfazer",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "enviando arquivos",
 "'.' is an invalid file name." => "'.' é um nome de arquivo inválido.",
@@ -40,12 +42,9 @@ $TRANSLATIONS = array(
 "Your storage is full, files can not be updated or synced anymore!" => "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Seu armazenamento está quase cheio ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nome de pasta inválido. O uso de 'Shared' é reservado para o Owncloud",
 "Name" => "Nome",
 "Size" => "Tamanho",
 "Modified" => "Modificado",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "%s could not be renamed" => "%s não pode ser renomeado",
 "Upload" => "Upload",
 "File handling" => "Tratamento de Arquivo",
@@ -71,10 +70,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor.",
 "Files are being scanned, please wait." => "Arquivos sendo escaneados, por favor aguarde.",
 "Current scanning" => "Scanning atual",
-"directory" => "diretório",
-"directories" => "diretórios",
-"file" => "arquivo",
-"files" => "arquivos",
 "Upgrading filesystem cache..." => "Atualizando cache do sistema de arquivos..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index 64110f6704ad795f53b76e5e93709438a4fa20d6..8cd73a9f70c1f745a78751e882264e6a0efd45f9 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "cancelar",
 "replaced {new_name} with {old_name}" => "substituido {new_name} por {old_name}",
 "undo" => "desfazer",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "A enviar os ficheiros",
 "'.' is an invalid file name." => "'.' não é um nome de ficheiro válido!",
@@ -40,12 +42,9 @@ $TRANSLATIONS = array(
 "Your storage is full, files can not be updated or synced anymore!" => "O seu armazenamento está cheio, os ficheiros não podem ser sincronizados.",
 "Your storage is almost full ({usedSpacePercent}%)" => "O seu espaço de armazenamento está quase cheiro ({usedSpacePercent}%)",
 "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.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nome de pasta inválido. O Uso de 'shared' é reservado para o ownCloud",
 "Name" => "Nome",
 "Size" => "Tamanho",
 "Modified" => "Modificado",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "%s could not be renamed" => "%s não pode ser renomeada",
 "Upload" => "Carregar",
 "File handling" => "Manuseamento de ficheiros",
@@ -71,10 +70,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.",
 "Files are being scanned, please wait." => "Os ficheiros estão a ser analisados, por favor aguarde.",
 "Current scanning" => "Análise actual",
-"directory" => "diretório",
-"directories" => "diretórios",
-"file" => "ficheiro",
-"files" => "ficheiros",
 "Upgrading filesystem cache..." => "Atualizar cache do sistema de ficheiros..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index 85805cf5623d15dfcf057ebc2c21c170be88db35..3b5359384ac97fb3e1792f4cf01e963822bf9716 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "anulare",
 "replaced {new_name} with {old_name}" => "{new_name} inlocuit cu {old_name}",
 "undo" => "Anulează ultima acțiune",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "files uploading" => "fișiere se încarcă",
 "'.' is an invalid file name." => "'.' este un nume invalid de fișier.",
@@ -40,12 +42,9 @@ $TRANSLATIONS = array(
 "Your storage is full, files can not be updated or synced anymore!" => "Spatiul de stocare este plin, nu mai puteti incarca s-au sincroniza alte fisiere.",
 "Your storage is almost full ({usedSpacePercent}%)" => "Spatiul de stocare este aproape plin ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Se pregătește descărcarea. Aceasta poate să dureze ceva timp dacă fișierele sunt mari.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Invalid folder name. Usage of 'Shared' is reserved by Ownclou",
 "Name" => "Nume",
 "Size" => "Dimensiune",
 "Modified" => "Modificat",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
 "%s could not be renamed" => "%s nu a putut fi redenumit",
 "Upload" => "Încărcare",
 "File handling" => "Manipulare fișiere",
@@ -71,10 +70,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server.",
 "Files are being scanned, please wait." => "Fișierele sunt scanate, te rog așteptă.",
 "Current scanning" => "ÃŽn curs de scanare",
-"directory" => "catalog",
-"directories" => "cataloage",
-"file" => "fișier",
-"files" => "fișiere",
 "Upgrading filesystem cache..." => "Modernizare fisiere de sistem cache.."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index fe771d2b571118f12825fe4ac6b8faf0b68271ee..e0bf97038d46cc5614e20cfe15e59593624c44a5 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "отмена",
 "replaced {new_name} with {old_name}" => "заменено {new_name} на {old_name}",
 "undo" => "отмена",
+"_%n folder_::_%n folders_" => array("%n папка","%n папки","%n папок"),
+"_%n file_::_%n files_" => array("%n файл","%n файла","%n файлов"),
 "_Uploading %n file_::_Uploading %n files_" => array("Закачка %n файла","Закачка %n файлов","Закачка %n файлов"),
 "files uploading" => "файлы загружаются",
 "'.' is an invalid file name." => "'.' - неправильное имя файла.",
@@ -40,12 +42,9 @@ $TRANSLATIONS = array(
 "Your storage is full, files can not be updated or synced anymore!" => "Ваше дисковое пространство полностью заполнено, произведите очистку перед загрузкой новых файлов.",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ваше хранилище почти заполнено ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Загрузка началась. Это может потребовать много времени, если файл большого размера.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Неправильное имя каталога. Имя 'Shared' зарезервировано.",
 "Name" => "Имя",
 "Size" => "Размер",
 "Modified" => "Изменён",
-"_%n folder_::_%n folders_" => array("%n папка","%n папки","%n папок"),
-"_%n file_::_%n files_" => array("%n файл","%n файла","%n файлов"),
 "%s could not be renamed" => "%s не может быть переименован",
 "Upload" => "Загрузка",
 "File handling" => "Управление файлами",
@@ -71,10 +70,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые вы пытаетесь загрузить, превышают лимит для файлов на этом сервере.",
 "Files are being scanned, please wait." => "Подождите, файлы сканируются.",
 "Current scanning" => "Текущее сканирование",
-"directory" => "директория",
-"directories" => "директории",
-"file" => "файл",
-"files" => "файлы",
 "Upgrading filesystem cache..." => "Обновление кэша файловой системы..."
 );
 $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/l10n/si_LK.php b/apps/files/l10n/si_LK.php
index ffb28e09584aa2b0e5d1094c1ff8e07aec9c9d0b..7d24370a092f06e8f1c22f18e007028c4a5de089 100644
--- a/apps/files/l10n/si_LK.php
+++ b/apps/files/l10n/si_LK.php
@@ -18,12 +18,12 @@ $TRANSLATIONS = array(
 "suggest name" => "නමක් යෝජනා කරන්න",
 "cancel" => "අත් හරින්න",
 "undo" => "නිෂ්ප්‍රභ කරන්න",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Name" => "නම",
 "Size" => "ප්‍රමාණය",
 "Modified" => "වෙනස් කළ",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "උඩුගත කරන්න",
 "File handling" => "ගොනු පරිහරණය",
 "Maximum upload size" => "උඩුගත කිරීමක උපරිම ප්‍රමාණය",
@@ -45,8 +45,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "උඩුගත කිරීම විශාල වැඩිය",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය",
 "Files are being scanned, please wait." => "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න",
-"Current scanning" => "වර්තමාන පරික්ෂාව",
-"file" => "ගොනුව",
-"files" => "ගොනු"
+"Current scanning" => "වර්තමාන පරික්ෂාව"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 41ff4fe25daed2dc607a19a7ecea128736c4bcb1..e7ade0137928bdc02c00cf7c513a84cca9024b16 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "zrušiť",
 "replaced {new_name} with {old_name}" => "prepísaný {new_name} súborom {old_name}",
 "undo" => "vrátiť",
+"_%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"),
 "_Uploading %n file_::_Uploading %n files_" => array("Nahrávam %n súbor","Nahrávam %n súbory","Nahrávam %n súborov"),
 "files uploading" => "nahrávanie súborov",
 "'.' is an invalid file name." => "'.' je neplatné meno súboru.",
@@ -41,12 +43,9 @@ $TRANSLATIONS = array(
 "Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložisko je takmer plné ({usedSpacePercent}%)",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Š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.",
 "Your download is being prepared. This might take some time if the files are big." => "Vaše sťahovanie sa pripravuje. Ak sú sťahované súbory veľké, môže to chvíľu trvať.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neplatné meno priečinka. Používanie mena 'Shared' je vyhradené len pre Owncloud",
 "Name" => "Názov",
 "Size" => "Veľkosť",
 "Modified" => "Upravené",
-"_%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"),
 "%s could not be renamed" => "%s nemohol byť premenovaný",
 "Upload" => "Odoslať",
 "File handling" => "Nastavenie správania sa k súborom",
@@ -72,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server.",
 "Files are being scanned, please wait." => "Čakajte, súbory sú prehľadávané.",
 "Current scanning" => "Práve prezerané",
-"directory" => "priečinok",
-"directories" => "priečinky",
-"file" => "súbor",
-"files" => "súbory",
 "Upgrading filesystem cache..." => "Aktualizujem medzipamäť súborového systému..."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 9922a0be7eeb826c0fef5def499989a69220abd7..6819ed3a3b3eeaecac9395245dde7b045b023442 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "prekliči",
 "replaced {new_name} with {old_name}" => "preimenovano ime {new_name} z imenom {old_name}",
 "undo" => "razveljavi",
+"_%n folder_::_%n folders_" => array("","","",""),
+"_%n file_::_%n files_" => array("","","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","","",""),
 "files uploading" => "poteka pošiljanje datotek",
 "'.' is an invalid file name." => "'.' je neveljavno ime datoteke.",
@@ -40,12 +42,9 @@ $TRANSLATIONS = array(
 "Your storage is full, files can not be updated or synced anymore!" => "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in usklajevati!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Mesto za shranjevanje je skoraj polno ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Postopek priprave datoteke za prejem je lahko dolgotrajen, če je datoteka zelo velika.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neveljavno ime mape. Uporaba oznake \"Souporaba\" je zadržan za sistem ownCloud.",
 "Name" => "Ime",
 "Size" => "Velikost",
 "Modified" => "Spremenjeno",
-"_%n folder_::_%n folders_" => array("","","",""),
-"_%n file_::_%n files_" => array("","","",""),
 "%s could not be renamed" => "%s ni bilo mogoče preimenovati",
 "Upload" => "Pošlji",
 "File handling" => "Upravljanje z datotekami",
@@ -71,10 +70,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku.",
 "Files are being scanned, please wait." => "Poteka preučevanje datotek, počakajte ...",
 "Current scanning" => "Trenutno poteka preučevanje",
-"directory" => "direktorij",
-"directories" => "direktoriji",
-"file" => "datoteka",
-"files" => "datoteke",
 "Upgrading filesystem cache..." => "Nadgrajevanje predpomnilnika datotečnega sistema ..."
 );
 $PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files/l10n/sq.php b/apps/files/l10n/sq.php
index 34250b56c3e89c144d41d071ed0adc094d79d362..ff09e7b4f9514b5ee27d066b311f5042c609549d 100644
--- a/apps/files/l10n/sq.php
+++ b/apps/files/l10n/sq.php
@@ -29,6 +29,8 @@ $TRANSLATIONS = array(
 "cancel" => "anulo",
 "replaced {new_name} with {old_name}" => "U zëvëndësua {new_name} me {old_name}",
 "undo" => "anulo",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "po ngarkoj skedarët",
 "'.' is an invalid file name." => "'.' është emër i pavlefshëm.",
@@ -37,12 +39,9 @@ $TRANSLATIONS = array(
 "Your storage is full, files can not be updated or synced anymore!" => "Hapësira juaj e memorizimit është plot, nuk mund të ngarkoni apo sinkronizoni më skedarët.",
 "Your storage is almost full ({usedSpacePercent}%)" => "Hapësira juaj e memorizimit është gati plot ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Shkarkimi juaj po përgatitet. Mund të duhet pak kohë nqse skedarët janë të mëdhenj.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Emri i dosjes është i pavlefshëm. Përdorimi i \"Shared\" është i rezervuar nga Owncloud-i.",
 "Name" => "Emri",
 "Size" => "Dimensioni",
 "Modified" => "Modifikuar",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "Ngarko",
 "File handling" => "Trajtimi i skedarit",
 "Maximum upload size" => "Dimensioni maksimal i ngarkimit",
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index d73188d483c939d6554ba040b915883de5b6821d..b8cf91f4da6558ec5e2e0da6af49ee8c4b14c77d 100644
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@@ -29,6 +29,8 @@ $TRANSLATIONS = array(
 "cancel" => "откажи",
 "replaced {new_name} with {old_name}" => "замењено {new_name} са {old_name}",
 "undo" => "опозови",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "files uploading" => "датотеке се отпремају",
 "'.' is an invalid file name." => "Датотека „.“ је неисправног имена.",
@@ -37,12 +39,9 @@ $TRANSLATIONS = array(
 "Your storage is full, files can not be updated or synced anymore!" => "Ваше складиште је пуно. Датотеке више не могу бити ажуриране ни синхронизоване.",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ваше складиште је скоро па пуно ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Припремам преузимање. Ово може да потраје ако су датотеке велике.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Неисправно име фасцикле. Фасцикла „Shared“ је резервисана за ownCloud.",
 "Name" => "Име",
 "Size" => "Величина",
 "Modified" => "Измењено",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
 "Upload" => "Отпреми",
 "File handling" => "Управљање датотекама",
 "Maximum upload size" => "Највећа величина датотеке",
diff --git a/apps/files/l10n/sr@latin.php b/apps/files/l10n/sr@latin.php
index bc7b11b8c53f44f3144ea22de969e5ecc60060f1..1965479fe664ffc83a71d05515abc2e2c291e34d 100644
--- a/apps/files/l10n/sr@latin.php
+++ b/apps/files/l10n/sr@latin.php
@@ -6,12 +6,12 @@ $TRANSLATIONS = array(
 "No file was uploaded" => "Nijedan fajl nije poslat",
 "Missing a temporary folder" => "Nedostaje privremena fascikla",
 "Files" => "Fajlovi",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "Name" => "Ime",
 "Size" => "Veličina",
 "Modified" => "Zadnja izmena",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
 "Upload" => "Pošalji",
 "Maximum upload size" => "Maksimalna veličina pošiljke",
 "Save" => "Snimi",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index d9010bc0f536ec25cc47f6975254ee03d820d962..20bf77bb6098d74ac910e84f1e66196bec590923 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "avbryt",
 "replaced {new_name} with {old_name}" => "ersatt {new_name} med {old_name}",
 "undo" => "Ã¥ngra",
+"_%n folder_::_%n folders_" => array("%n mapp","%n mappar"),
+"_%n file_::_%n files_" => array("%n fil","%n filer"),
 "_Uploading %n file_::_Uploading %n files_" => array("Laddar upp %n fil","Laddar upp %n filer"),
 "files uploading" => "filer laddas upp",
 "'.' is an invalid file name." => "'.' är ett ogiltigt filnamn.",
@@ -41,12 +43,9 @@ $TRANSLATIONS = array(
 "Your storage is almost full ({usedSpacePercent}%)" => "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)",
 "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.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ogiltigt mappnamn. Användande av 'Shared' är reserverat av ownCloud",
 "Name" => "Namn",
 "Size" => "Storlek",
 "Modified" => "Ändrad",
-"_%n folder_::_%n folders_" => array("%n mapp","%n mappar"),
-"_%n file_::_%n files_" => array("%n fil","%n filer"),
 "%s could not be renamed" => "%s kunde inte namnändras",
 "Upload" => "Ladda upp",
 "File handling" => "Filhantering",
@@ -72,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.",
 "Files are being scanned, please wait." => "Filer skannas, var god vänta",
 "Current scanning" => "Aktuell skanning",
-"directory" => "mapp",
-"directories" => "mappar",
-"file" => "fil",
-"files" => "filer",
 "Upgrading filesystem cache..." => "Uppgraderar filsystemets cache..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php
index eb39218e48d85e34a15e14e4dfef9716a637607b..fc52c16daf381ecf1509342611bf1ca338f988da 100644
--- a/apps/files/l10n/ta_LK.php
+++ b/apps/files/l10n/ta_LK.php
@@ -22,13 +22,13 @@ $TRANSLATIONS = array(
 "cancel" => "இரத்து செய்க",
 "replaced {new_name} with {old_name}" => "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது",
 "undo" => "முன் செயல் நீக்கம் ",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது.",
 "Name" => "பெயர்",
 "Size" => "அளவு",
 "Modified" => "மாற்றப்பட்டது",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "பதிவேற்றுக",
 "File handling" => "கோப்பு கையாளுதல்",
 "Maximum upload size" => "பதிவேற்றக்கூடிய ஆகக்கூடிய அளவு ",
diff --git a/apps/files/l10n/te.php b/apps/files/l10n/te.php
index 5a108274dd9c2654ea06c7f2fa4fd64562ff9d66..60aabc8a3655753f2cc3c393371c8e8372f76a79 100644
--- a/apps/files/l10n/te.php
+++ b/apps/files/l10n/te.php
@@ -3,11 +3,11 @@ $TRANSLATIONS = array(
 "Error" => "పొరపాటు",
 "Delete permanently" => "శాశ్వతంగా తొలగించు",
 "cancel" => "రద్దుచేయి",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Name" => "పేరు",
 "Size" => "పరిమాణం",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Save" => "భద్రపరచు",
 "Folder" => "సంచయం",
 "Delete" => "తొలగించు"
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index c101398918e456427c9ccfa51f3ab5ae6903e659..b65c0bc705ea0b1ad1dc98cb5488c7478ada8799 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -28,6 +28,8 @@ $TRANSLATIONS = array(
 "cancel" => "ยกเลิก",
 "replaced {new_name} with {old_name}" => "แทนที่ {new_name} ด้วย {old_name} แล้ว",
 "undo" => "เลิกทำ",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "การอัพโหลดไฟล์",
 "'.' is an invalid file name." => "'.' เป็นชื่อไฟล์ที่ไม่ถูกต้อง",
@@ -36,12 +38,9 @@ $TRANSLATIONS = array(
 "Your storage is full, files can not be updated or synced anymore!" => "พื้นที่จัดเก็บข้อมูลของคุณเต็มแล้ว ไม่สามารถอัพเดทหรือผสานไฟล์ต่างๆได้อีกต่อไป",
 "Your storage is almost full ({usedSpacePercent}%)" => "พื้นที่จัดเก็บข้อมูลของคุณใกล้เต็มแล้ว ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "ชื่อโฟลเดอร์ไม่ถูกต้อง การใช้งาน 'แชร์' สงวนไว้สำหรับ Owncloud เท่านั้น",
 "Name" => "ชื่อ",
 "Size" => "ขนาด",
 "Modified" => "แก้ไขแล้ว",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "Upload" => "อัพโหลด",
 "File handling" => "การจัดกาไฟล์",
 "Maximum upload size" => "ขนาดไฟล์สูงสุดที่อัพโหลดได้",
@@ -64,8 +63,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
 "Files are being scanned, please wait." => "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่.",
 "Current scanning" => "ไฟล์ที่กำลังสแกนอยู่ขณะนี้",
-"file" => "ไฟล์",
-"files" => "ไฟล์",
 "Upgrading filesystem cache..." => "กำลังอัพเกรดหน่วยความจำแคชของระบบไฟล์..."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 661e8572e8f806d0ce40787e6e8f742e8f3ba019..d317b11d532f9e938808a0eadab3bf96fd099452 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "iptal",
 "replaced {new_name} with {old_name}" => "{new_name} ismi {old_name} ile deÄŸiÅŸtirildi",
 "undo" => "geri al",
+"_%n folder_::_%n folders_" => array("%n dizin","%n dizin"),
+"_%n file_::_%n files_" => array("%n dosya","%n dosya"),
 "_Uploading %n file_::_Uploading %n files_" => array("%n dosya yükleniyor","%n dosya yükleniyor"),
 "files uploading" => "Dosyalar yükleniyor",
 "'.' is an invalid file name." => "'.' geçersiz dosya adı.",
@@ -41,12 +43,9 @@ $TRANSLATIONS = array(
 "Your storage is almost full ({usedSpacePercent}%)" => "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Ş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.",
 "Your download is being prepared. This might take some time if the files are big." => "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Geçersiz dizin adı. Shared isminin kullanımı Owncloud tarafından rezerver edilmiştir.",
 "Name" => "Ä°sim",
 "Size" => "Boyut",
 "Modified" => "DeÄŸiÅŸtirilme",
-"_%n folder_::_%n folders_" => array("%n dizin","%n dizin"),
-"_%n file_::_%n files_" => array("%n dosya","%n dosya"),
 "%s could not be renamed" => "%s yeniden adlandırılamadı",
 "Upload" => "Yükle",
 "File handling" => "Dosya taşıma",
@@ -72,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor.",
 "Files are being scanned, please wait." => "Dosyalar taranıyor, lütfen bekleyin.",
 "Current scanning" => "Güncel tarama",
-"directory" => "dizin",
-"directories" => "dizinler",
-"file" => "dosya",
-"files" => "dosyalar",
 "Upgrading filesystem cache..." => "Sistem dosyası önbelleği güncelleniyor"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/ug.php b/apps/files/l10n/ug.php
index 2eceeea44a87880a6dee33508a591b9b19784710..920d077e4ebc94c3927e9710bcbc9e7ceb309c0d 100644
--- a/apps/files/l10n/ug.php
+++ b/apps/files/l10n/ug.php
@@ -20,13 +20,13 @@ $TRANSLATIONS = array(
 "suggest name" => "تەۋسىيە ئات",
 "cancel" => "ۋاز كەچ",
 "undo" => "يېنىۋال",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "ھۆججەت يۈكلىنىۋاتىدۇ",
 "Name" => "ئاتى",
 "Size" => "چوڭلۇقى",
 "Modified" => "ئۆزگەرتكەن",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "Upload" => "يۈكلە",
 "Save" => "ساقلا",
 "New" => "يېڭى",
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index f34383d969d6577227ce93c93873b405c2b6f3b5..79a18231d2c838825ef54f66cbfcffe89a1a6ceb 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -29,6 +29,8 @@ $TRANSLATIONS = array(
 "cancel" => "відміна",
 "replaced {new_name} with {old_name}" => "замінено {new_name} на {old_name}",
 "undo" => "відмінити",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "files uploading" => "файли завантажуються",
 "'.' is an invalid file name." => "'.' це невірне ім'я файлу.",
@@ -37,12 +39,9 @@ $TRANSLATIONS = array(
 "Your storage is full, files can not be updated or synced anymore!" => "Ваше сховище переповнене, файли більше не можуть бути оновлені або синхронізовані !",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ваше сховище майже повне ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Невірне ім'я теки. Використання \"Shared\" зарезервовано Owncloud",
 "Name" => "Ім'я",
 "Size" => "Розмір",
 "Modified" => "Змінено",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
 "%s could not be renamed" => "%s не може бути перейменований",
 "Upload" => "Вивантажити",
 "File handling" => "Робота з файлами",
@@ -68,10 +67,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері.",
 "Files are being scanned, please wait." => "Файли скануються, зачекайте, будь-ласка.",
 "Current scanning" => "Поточне сканування",
-"directory" => "каталог",
-"directories" => "каталоги",
-"file" => "файл",
-"files" => "файли",
 "Upgrading filesystem cache..." => "Оновлення кеша файлової системи..."
 );
 $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/l10n/ur_PK.php b/apps/files/l10n/ur_PK.php
index 15c24700df0bb02f3dba942e2b67ae19615e9983..6854c421587594c1eb30dd97924044e0cfebd3f5 100644
--- a/apps/files/l10n/ur_PK.php
+++ b/apps/files/l10n/ur_PK.php
@@ -1,9 +1,9 @@
 <?php
 $TRANSLATIONS = array(
 "Error" => "ایرر",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Unshare" => "شئیرنگ ختم کریں"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index ae5b152ed0806164c0a2de3d1d476999de0cb0d4..02b184d218c27363b76bc5d5864dd7256cd86d17 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -29,6 +29,8 @@ $TRANSLATIONS = array(
 "cancel" => "hủy",
 "replaced {new_name} with {old_name}" => "đã thay thế {new_name} bằng {old_name}",
 "undo" => "lùi lại",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "tệp tin đang được tải lên",
 "'.' is an invalid file name." => "'.' là một tên file không hợp lệ",
@@ -37,12 +39,9 @@ $TRANSLATIONS = array(
 "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}%)",
 "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.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Invalid folder name. Usage of 'Shared' is reserved by Owncloud",
 "Name" => "Tên",
 "Size" => "Kích cỡ",
 "Modified" => "Thay đổi",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "Upload" => "Tải lên",
 "File handling" => "Xử lý tập tin",
 "Maximum upload size" => "Kích thước tối đa ",
@@ -67,8 +66,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ .",
 "Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng chờ.",
 "Current scanning" => "Hiện tại đang quét",
-"file" => "file",
-"files" => "files",
 "Upgrading filesystem cache..." => "Đang nâng cấp bộ nhớ đệm cho tập tin hệ thống..."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php
deleted file mode 100644
index d031a1e5a550a30ca0b4c20abbbe400cf72890a7..0000000000000000000000000000000000000000
--- a/apps/files/l10n/zh_CN.GB2312.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "无法移动 %s - 存在同名文件",
-"Could not move %s" => "无法移动 %s",
-"Unable to set upload directory." => "无法设置上传文件夹",
-"Invalid Token" => "非法Token",
-"No file was uploaded. Unknown error" => "没有上传文件。未知错误",
-"There is no error, the file uploaded with success" => "文件上传成功",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "上传的文件超过了php.ini指定的upload_max_filesize",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上传的文件超过了 HTML 表格中指定的 MAX_FILE_SIZE 选项",
-"The uploaded file was only partially uploaded" => "文件部分上传",
-"No file was uploaded" => "没有上传文件",
-"Missing a temporary folder" => "缺失临时文件夹",
-"Failed to write to disk" => "写磁盘失败",
-"Not enough storage available" => "容量不足",
-"Invalid directory." => "无效文件夹",
-"Files" => "文件",
-"Unable to upload your file as it is a directory or has 0 bytes" => "不能上传您的文件，由于它是文件夹或者为空文件",
-"Not enough space available" => "容量不足",
-"Upload cancelled." => "上传取消了",
-"File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传。关闭页面会取消上传。",
-"URL cannot be empty." => "网址不能为空。",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "无效文件夹名。“Shared”已经被系统保留。",
-"Error" => "出错",
-"Share" => "分享",
-"Delete permanently" => "永久删除",
-"Rename" => "重命名",
-"Pending" => "等待中",
-"{new_name} already exists" => "{new_name} 已存在",
-"replace" => "替换",
-"suggest name" => "推荐名称",
-"cancel" => "取消",
-"replaced {new_name} with {old_name}" => "已用 {old_name} 替换 {new_name}",
-"undo" => "撤销",
-"_Uploading %n file_::_Uploading %n files_" => array("正在上传 %n 个文件"),
-"files uploading" => "个文件正在上传",
-"'.' is an invalid file name." => "'.' 文件名不正确",
-"File name cannot be empty." => "文件名不能为空",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "文件名内不能包含以下符号：\\ / < > : \" | ?和 *",
-"Your storage is full, files can not be updated or synced anymore!" => "容量已满，不能再同步/上传文件了！",
-"Your storage is almost full ({usedSpacePercent}%)" => "你的空间快用满了 ({usedSpacePercent}%)",
-"Your download is being prepared. This might take some time if the files are big." => "正在下载，可能会花点时间，跟文件大小有关",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "不正确文件夹名。Shared是保留名，不能使用。",
-"Name" => "名称",
-"Size" => "大小",
-"Modified" => "修改日期",
-"_%n folder_::_%n folders_" => array("%n 个文件夹"),
-"_%n file_::_%n files_" => array("%n 个文件"),
-"%s could not be renamed" => "不能重命名 %s",
-"Upload" => "上传",
-"File handling" => "文件处理中",
-"Maximum upload size" => "最大上传大小",
-"max. possible: " => "最大可能",
-"Needed for multi-file and folder downloads." => "需要多文件和文件夹下载.",
-"Enable ZIP-download" => "支持ZIP下载",
-"0 is unlimited" => "0是无限的",
-"Maximum input size for ZIP files" => "最大的ZIP文件输入大小",
-"Save" => "保存",
-"New" => "新建",
-"Text file" => "文本文档",
-"Folder" => "文件夹",
-"From link" => "来自链接",
-"Deleted files" => "已删除的文件",
-"Cancel upload" => "取消上传",
-"You don’t have write permissions here." => "您没有写入权限。",
-"Nothing in here. Upload something!" => "这里没有东西.上传点什么!",
-"Download" => "下载",
-"Unshare" => "取消分享",
-"Delete" => "删除",
-"Upload too large" => "上传过大",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "你正在试图上传的文件超过了此服务器支持的最大的文件大小.",
-"Files are being scanned, please wait." => "正在扫描文件,请稍候.",
-"Current scanning" => "正在扫描",
-"directory" => "文件夹",
-"directories" => "文件夹",
-"file" => "文件",
-"files" => "文件",
-"Upgrading filesystem cache..." => "升级系统缓存..."
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 495e9d9d9dd511b349776d0349cd3f19ab84b48b..fa2e3403f4ba4ded15ae0c7829101e65e1d9a1a3 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "取消",
 "replaced {new_name} with {old_name}" => "已将 {old_name}替换成 {new_name}",
 "undo" => "撤销",
+"_%n folder_::_%n folders_" => array("%n 文件夹"),
+"_%n file_::_%n files_" => array("%n个文件"),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "文件上传中",
 "'.' is an invalid file name." => "'.' 是一个无效的文件名。",
@@ -40,12 +42,9 @@ $TRANSLATIONS = array(
 "Your storage is full, files can not be updated or synced anymore!" => "您的存储空间已满，文件将无法更新或同步！",
 "Your storage is almost full ({usedSpacePercent}%)" => "您的存储空间即将用完 ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "下载正在准备中。如果文件较大可能会花费一些时间。",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "无效文件夹名。'共享' 是 Owncloud 预留的文件夹名。",
 "Name" => "名称",
 "Size" => "大小",
 "Modified" => "修改日期",
-"_%n folder_::_%n folders_" => array("%n 文件夹"),
-"_%n file_::_%n files_" => array("%n个文件"),
 "%s could not be renamed" => "%s 不能被重命名",
 "Upload" => "上传",
 "File handling" => "文件处理",
@@ -71,8 +70,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "您正尝试上传的文件超过了此服务器可以上传的最大容量限制",
 "Files are being scanned, please wait." => "文件正在被扫描，请稍候。",
 "Current scanning" => "当前扫描",
-"file" => "文件",
-"files" => "文件",
 "Upgrading filesystem cache..." => "正在更新文件系统缓存..."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/zh_HK.php b/apps/files/l10n/zh_HK.php
index a9064fa7f780944989cfb4b7629a8655a4306b52..febed4fe8fb68048048ac876a81ba9ed6b5b53c3 100644
--- a/apps/files/l10n/zh_HK.php
+++ b/apps/files/l10n/zh_HK.php
@@ -3,10 +3,10 @@ $TRANSLATIONS = array(
 "Files" => "文件",
 "Error" => "錯誤",
 "Share" => "分享",
-"_Uploading %n file_::_Uploading %n files_" => array(""),
-"Name" => "名稱",
 "_%n folder_::_%n folders_" => array(""),
 "_%n file_::_%n files_" => array(""),
+"_Uploading %n file_::_Uploading %n files_" => array(""),
+"Name" => "名稱",
 "Upload" => "上傳",
 "Save" => "儲存",
 "Download" => "下載",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index b96b02e5d93e4950fc75e4353b013a85f5ddcd47..6ba8bf35de8730f758b606534c1e98fa43ce2be6 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -32,20 +32,20 @@ $TRANSLATIONS = array(
 "cancel" => "取消",
 "replaced {new_name} with {old_name}" => "使用 {new_name} 取代 {old_name}",
 "undo" => "復原",
-"_Uploading %n file_::_Uploading %n files_" => array(""),
+"_%n folder_::_%n folders_" => array("%n 個資料夾"),
+"_%n file_::_%n files_" => array("%n 個檔案"),
+"_Uploading %n file_::_Uploading %n files_" => array("%n 個檔案正在上傳"),
 "files uploading" => "檔案正在上傳中",
 "'.' is an invalid file name." => "'.' 是不合法的檔名。",
 "File name cannot be empty." => "檔名不能為空。",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "檔名不合法，不允許 '\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 。",
 "Your storage is full, files can not be updated or synced anymore!" => "您的儲存空間已滿，沒有辦法再更新或是同步檔案！",
 "Your storage is almost full ({usedSpacePercent}%)" => "您的儲存空間快要滿了 ({usedSpacePercent}%)",
+"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." => "正在準備您的下載，若您的檔案較大，將會需要更多時間。",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留",
 "Name" => "名稱",
 "Size" => "大小",
 "Modified" => "修改",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "%s could not be renamed" => "無法重新命名 %s",
 "Upload" => "上傳",
 "File handling" => "檔案處理",
@@ -71,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "您試圖上傳的檔案已超過伺服器的最大檔案大小限制。",
 "Files are being scanned, please wait." => "正在掃描檔案，請稍等。",
 "Current scanning" => "目前掃描",
-"directory" => "目錄",
-"directories" => "目錄",
-"file" => "檔案",
-"files" => "檔案",
 "Upgrading filesystem cache..." => "正在升級檔案系統快取..."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php
index f2b1f142e9b81bd745393c19b22e3ee27783cda2..7135ef9f656525fbc18b3fd7c87b95873ce481a2 100644
--- a/apps/files/lib/helper.php
+++ b/apps/files/lib/helper.php
@@ -11,7 +11,7 @@ class Helper
 		$maxHumanFilesize = $l->t('Upload') . ' max. ' . $maxHumanFilesize;
 
 		// information about storage capacities
-		$storageInfo = \OC_Helper::getStorageInfo();
+		$storageInfo = \OC_Helper::getStorageInfo($dir);
 
 		return array('uploadMaxFilesize' => $maxUploadFilesize,
 					 'maxHumanFilesize'  => $maxHumanFilesize,
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 0c7d6936697fb5ce09222a47896710307ce15308..3e6f619868de068416d79819c7853beba6fb3174 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -1,14 +1,5 @@
 <input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>">
-<?php $totalfiles = 0;
-$totaldirs = 0;
-$totalsize = 0; ?>
 <?php foreach($_['files'] as $file):
-	$totalsize += $file['size'];
-	if ($file['type'] === 'dir') {
-		$totaldirs++;
-	} else {
-		$totalfiles++;
-	}
 	// the bigger the file, the darker the shade of grey; megabytes*2
 	$simple_size_color = intval(160-$file['size']/(1024*1024)*2);
 	if($simple_size_color<0) $simple_size_color = 0;
@@ -64,33 +55,4 @@ $totalsize = 0; ?>
 			</span>
 		</td>
 	</tr>
-<?php endforeach; ?>
-	<?php if ($totaldirs !== 0 || $totalfiles !== 0): ?>
-	<tr class="summary">
-		<td><span class="info">
-			<?php if ($totaldirs !== 0) {
-				p($totaldirs.' ');
-				if ($totaldirs === 1) {
-					p($l->t('directory'));
-				} else {
-					p($l->t('directories'));
-				}
-			}
-			if ($totaldirs !== 0 && $totalfiles !== 0) {
-				p(' & ');
-			}
-			if ($totalfiles !== 0) {
-				p($totalfiles.' ');
-				if ($totalfiles === 1) {
-					p($l->t('file'));
-				} else {
-					p($l->t('files'));
-				}
-			} ?>
-		</span></td>
-		<td class="filesize">
-		<?php print_unescaped(OCP\human_file_size($totalsize)); ?>
-		</td>
-		<td></td>
-	</tr>
-	<?php endif;
+<?php endforeach;
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index a723d80773b6751b7fb9f465995f2a2c56a55aec..a80eb3e65214a8bbbc4d70dff8a801be95cababc 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -8,12 +8,22 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne.",
 "Private key password successfully updated." => "Heslo súkromného kľúča je úspešne aktualizované.",
 "Could not update the private key password. Maybe the old password was not correct." => "Nemožno aktualizovať heslo súkromného kľúča. Možno nebolo staré heslo správne.",
+"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." => "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.",
+"Missing requirements." => "Chýbajúce požiadavky.",
+"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." => "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á.",
+"Following users are not set up for encryption:" => "Nasledujúci používatelia nie sú nastavení pre šifrovanie:",
 "Saving..." => "Ukladám...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "Váš súkromný kľúč je neplatný. Možno bolo Vaše heslo zmenené z vonku.",
+"You can unlock your private key in your " => "Môžte odomknúť váš privátny kľúč v",
 "personal settings" => "osobné nastavenia",
 "Encryption" => "Å ifrovanie",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Povoliť obnovovací kľúč (umožňuje obnoviť používateľské súbory v prípade straty hesla):",
+"Recovery key password" => "Heslo obnovovacieho kľúča",
 "Enabled" => "Povolené",
 "Disabled" => "Zakázané",
+"Change recovery key password:" => "Zmeniť heslo obnovovacieho kľúča:",
+"Old Recovery key password" => "Staré heslo obnovovacieho kľúča",
+"New Recovery key password" => "Nové heslo obnovovacieho kľúča",
 "Change Password" => "Zmeniť heslo",
 "Your private key password no longer match your log-in password:" => "Vaše heslo súkromného kľúča je rovnaké ako Vaše prihlasovacie heslo:",
 "Set your old private key password to your current log-in password." => "Nastavte si staré heslo súkromného kľúča k Vášmu súčasnému prihlasovaciemu heslu.",
diff --git a/apps/files_encryption/l10n/zh_CN.GB2312.php b/apps/files_encryption/l10n/zh_CN.GB2312.php
deleted file mode 100644
index 0f9f459c771ab3145b7983b4148c37c566483d10..0000000000000000000000000000000000000000
--- a/apps/files_encryption/l10n/zh_CN.GB2312.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Saving..." => "保存中...",
-"Encryption" => "加密"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/3rdparty/Dropbox/API.php b/apps/files_external/3rdparty/Dropbox/API.php
new file mode 100644
index 0000000000000000000000000000000000000000..8cdce678e1c8101d756cd72d36f4d9fbb49c18df
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/API.php
@@ -0,0 +1,380 @@
+<?php
+
+/**
+ * Dropbox API class 
+ * 
+ * @package Dropbox 
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+class Dropbox_API {
+
+    /**
+     * Sandbox root-path
+     */
+    const ROOT_SANDBOX = 'sandbox';
+
+    /**
+     * Dropbox root-path
+     */
+    const ROOT_DROPBOX = 'dropbox';
+    
+    /**
+     * API URl
+     */
+    protected $api_url = 'https://api.dropbox.com/1/';
+    
+    /**
+     * Content API URl
+     */
+    protected $api_content_url = 'https://api-content.dropbox.com/1/';
+
+    /**
+     * OAuth object 
+     * 
+     * @var Dropbox_OAuth
+     */
+    protected $oauth;
+    
+    /**
+     * Default root-path, this will most likely be 'sandbox' or 'dropbox' 
+     * 
+     * @var string 
+     */
+    protected $root;
+    protected $useSSL;
+
+    /**
+     * Constructor 
+     * 
+     * @param Dropbox_OAuth Dropbox_Auth object
+     * @param string $root default root path (sandbox or dropbox) 
+     */
+    public function __construct(Dropbox_OAuth $oauth, $root = self::ROOT_DROPBOX, $useSSL = true) {
+
+        $this->oauth = $oauth;
+        $this->root = $root;
+        $this->useSSL = $useSSL;
+        if (!$this->useSSL)
+        {
+            throw new Dropbox_Exception('Dropbox REST API now requires that all requests use SSL');
+        }
+
+    }
+
+    /**
+     * Returns information about the current dropbox account 
+     * 
+     * @return stdclass 
+     */
+    public function getAccountInfo() {
+
+        $data = $this->oauth->fetch($this->api_url . 'account/info');
+        return json_decode($data['body'],true);
+
+    }
+
+    /**
+     * Returns a file's contents 
+     * 
+     * @param string $path path 
+     * @param string $root Use this to override the default root path (sandbox/dropbox) 
+     * @return string 
+     */
+    public function getFile($path = '', $root = null) {
+
+        if (is_null($root)) $root = $this->root;
+        $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path));
+        $result = $this->oauth->fetch($this->api_content_url . 'files/' . $root . '/' . ltrim($path,'/'));
+        return $result['body'];
+
+    }
+
+    /**
+     * Uploads a new file
+     *
+     * @param string $path Target path (including filename) 
+     * @param string $file Either a path to a file or a stream resource 
+     * @param string $root Use this to override the default root path (sandbox/dropbox)  
+     * @return bool 
+     */
+    public function putFile($path, $file, $root = null) {
+
+        $directory = dirname($path);
+        $filename = basename($path);
+
+        if($directory==='.') $directory = '';
+        $directory = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($directory));
+//         $filename = str_replace('~', '%7E', rawurlencode($filename));
+        if (is_null($root)) $root = $this->root;
+
+        if (is_string($file)) {
+
+            $file = fopen($file,'rb');
+
+        } elseif (!is_resource($file)) {
+            throw new Dropbox_Exception('File must be a file-resource or a string');
+        }
+        $result=$this->multipartFetch($this->api_content_url . 'files/' . 
+                $root . '/' . trim($directory,'/'), $file, $filename);
+        
+        if(!isset($result["httpStatus"]) || $result["httpStatus"] != 200) 
+            throw new Dropbox_Exception("Uploading file to Dropbox failed");
+
+        return true;
+    }
+
+
+    /**
+     * Copies a file or directory from one location to another 
+     *
+     * This method returns the file information of the newly created file.
+     *
+     * @param string $from source path 
+     * @param string $to destination path 
+     * @param string $root Use this to override the default root path (sandbox/dropbox)  
+     * @return stdclass 
+     */
+    public function copy($from, $to, $root = null) {
+
+        if (is_null($root)) $root = $this->root;
+        $response = $this->oauth->fetch($this->api_url . 'fileops/copy', array('from_path' => $from, 'to_path' => $to, 'root' => $root), 'POST');
+
+        return json_decode($response['body'],true);
+
+    }
+
+    /**
+     * Creates a new folder 
+     *
+     * This method returns the information from the newly created directory
+     *
+     * @param string $path 
+     * @param string $root Use this to override the default root path (sandbox/dropbox)  
+     * @return stdclass 
+     */
+    public function createFolder($path, $root = null) {
+
+        if (is_null($root)) $root = $this->root;
+
+        // Making sure the path starts with a /
+//         $path = '/' . ltrim($path,'/');
+
+        $response = $this->oauth->fetch($this->api_url . 'fileops/create_folder', array('path' => $path, 'root' => $root),'POST');
+        return json_decode($response['body'],true);
+
+    }
+
+    /**
+     * Deletes a file or folder.
+     *
+     * This method will return the metadata information from the deleted file or folder, if successful.
+     * 
+     * @param string $path Path to new folder 
+     * @param string $root Use this to override the default root path (sandbox/dropbox)  
+     * @return array 
+     */
+    public function delete($path, $root = null) {
+
+        if (is_null($root)) $root = $this->root;
+        $response = $this->oauth->fetch($this->api_url . 'fileops/delete', array('path' => $path, 'root' => $root), 'POST');
+        return json_decode($response['body']);
+
+    }
+
+    /**
+     * Moves a file or directory to a new location 
+     *
+     * This method returns the information from the newly created directory
+     *
+     * @param mixed $from Source path 
+     * @param mixed $to destination path
+     * @param string $root Use this to override the default root path (sandbox/dropbox) 
+     * @return stdclass 
+     */
+    public function move($from, $to, $root = null) {
+
+        if (is_null($root)) $root = $this->root;
+        $response = $this->oauth->fetch($this->api_url . 'fileops/move', array('from_path' => rawurldecode($from), 'to_path' => rawurldecode($to), 'root' => $root), 'POST');
+
+        return json_decode($response['body'],true);
+
+    }
+
+    /**
+     * Returns file and directory information
+     * 
+     * @param string $path Path to receive information from 
+     * @param bool $list When set to true, this method returns information from all files in a directory. When set to false it will only return infromation from the specified directory.
+     * @param string $hash If a hash is supplied, this method simply returns true if nothing has changed since the last request. Good for caching.
+     * @param int $fileLimit Maximum number of file-information to receive 
+     * @param string $root Use this to override the default root path (sandbox/dropbox) 
+     * @return array|true 
+     */
+    public function getMetaData($path, $list = true, $hash = null, $fileLimit = null, $root = null) {
+
+        if (is_null($root)) $root = $this->root;
+
+        $args = array(
+            'list' => $list,
+        );
+
+        if (!is_null($hash)) $args['hash'] = $hash; 
+        if (!is_null($fileLimit)) $args['file_limit'] = $fileLimit; 
+
+        $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path));
+        $response = $this->oauth->fetch($this->api_url . 'metadata/' . $root . '/' . ltrim($path,'/'), $args);
+
+        /* 304 is not modified */
+        if ($response['httpStatus']==304) {
+            return true; 
+        } else {
+            return json_decode($response['body'],true);
+        }
+
+    } 
+
+    /**
+    * A way of letting you keep up with changes to files and folders in a user's Dropbox. You can periodically call /delta to get a list of "delta entries", which are instructions on how to update your local state to match the server's state.
+    *
+    * This method returns the information from the newly created directory
+    *
+    * @param string $cursor A string that is used to keep track of your current state. On the next call pass in this value to return delta entries that have been recorded since the cursor was returned.
+    * @return stdclass
+    */
+    public function delta($cursor) {
+    
+    	$arg['cursor'] = $cursor;
+    
+    	$response = $this->oauth->fetch($this->api_url . 'delta', $arg, 'POST');
+    	return json_decode($response['body'],true);
+    
+    }
+
+    /**
+     * Returns a thumbnail (as a string) for a file path. 
+     * 
+     * @param string $path Path to file 
+     * @param string $size small, medium or large 
+     * @param string $root Use this to override the default root path (sandbox/dropbox)  
+     * @return string 
+     */
+    public function getThumbnail($path, $size = 'small', $root = null) {
+
+        if (is_null($root)) $root = $this->root;
+        $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path));
+        $response = $this->oauth->fetch($this->api_content_url . 'thumbnails/' . $root . '/' . ltrim($path,'/'),array('size' => $size));
+
+        return $response['body'];
+
+    }
+
+    /**
+     * This method is used to generate multipart POST requests for file upload 
+     * 
+     * @param string $uri 
+     * @param array $arguments 
+     * @return bool 
+     */
+    protected function multipartFetch($uri, $file, $filename) {
+
+        /* random string */
+        $boundary = 'R50hrfBj5JYyfR3vF3wR96GPCC9Fd2q2pVMERvEaOE3D8LZTgLLbRpNwXek3';
+
+        $headers = array(
+            'Content-Type' => 'multipart/form-data; boundary=' . $boundary,
+        );
+
+        $body="--" . $boundary . "\r\n";
+        $body.="Content-Disposition: form-data; name=file; filename=".rawurldecode($filename)."\r\n";
+        $body.="Content-type: application/octet-stream\r\n";
+        $body.="\r\n";
+        $body.=stream_get_contents($file);
+        $body.="\r\n";
+        $body.="--" . $boundary . "--";
+
+        // Dropbox requires the filename to also be part of the regular arguments, so it becomes
+        // part of the signature. 
+        $uri.='?file=' . $filename;
+
+        return $this->oauth->fetch($uri, $body, 'POST', $headers);
+
+    }
+	
+	
+	/**
+     * Search
+     *
+     * Returns metadata for all files and folders that match the search query.
+     *
+	 * @added by: diszo.sasil 
+	 *
+     * @param string $query	 
+     * @param string $root Use this to override the default root path (sandbox/dropbox)
+	 * @param string $path
+     * @return array
+     */
+	public function search($query = '', $root = null, $path = ''){
+		if (is_null($root)) $root = $this->root;
+		if(!empty($path)){
+			$path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path));
+		}
+        $response = $this->oauth->fetch($this->api_url . 'search/' . $root . '/' . ltrim($path,'/'),array('query' => $query));
+        return json_decode($response['body'],true);
+	}
+
+    /**
+     * Creates and returns a shareable link to files or folders.
+     * 
+     * Note: Links created by the /shares API call expire after thirty days.
+     * 
+     * @param type $path
+     * @param type $root
+     * @return type 
+     */
+    public function share($path, $root = null) {
+        if (is_null($root)) $root = $this->root;
+        $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path));
+        $response = $this->oauth->fetch($this->api_url.  'shares/'. $root . '/' . ltrim($path, '/'), array(), 'POST');
+        return json_decode($response['body'],true);
+
+    }
+
+    /**
+    * Returns a link directly to a file.
+    * Similar to /shares. The difference is that this bypasses the Dropbox webserver, used to provide a preview of the file, so that you can effectively stream the contents of your media.
+    *
+    * Note: The /media link expires after four hours, allotting enough time to stream files, but not enough to leave a connection open indefinitely.
+    *
+    * @param type $path
+    * @param type $root
+    * @return type
+    */
+    public function media($path, $root = null) {
+
+    	if (is_null($root)) $root = $this->root;
+    	$path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path));
+    	$response = $this->oauth->fetch($this->api_url.  'media/'. $root . '/' . ltrim($path, '/'), array(), 'POST');
+    	return json_decode($response['body'],true);
+    
+    }
+
+    /**
+    * Creates and returns a copy_ref to a file. This reference string can be used to copy that file to another user's Dropbox by passing it in as the from_copy_ref parameter on /fileops/copy.
+    *
+    * @param type $path
+    * @param type $root
+    * @return type
+    */
+    public function copy_ref($path, $root = null) {
+
+    	if (is_null($root)) $root = $this->root;
+    	$path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path));
+    	$response = $this->oauth->fetch($this->api_url.  'copy_ref/'. $root . '/' . ltrim($path, '/'));
+    	return json_decode($response['body'],true);
+    
+    }
+    
+
+}
diff --git a/apps/files_external/3rdparty/Dropbox/Exception.php b/apps/files_external/3rdparty/Dropbox/Exception.php
new file mode 100644
index 0000000000000000000000000000000000000000..50cbc4c79150e821841cae2cb7383a63d88b2e3b
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/Exception.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * Dropbox base exception 
+ * 
+ * @package Dropbox 
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+/**
+ * Base exception class
+ */
+class Dropbox_Exception extends Exception { }
diff --git a/apps/files_external/3rdparty/Dropbox/Exception/Forbidden.php b/apps/files_external/3rdparty/Dropbox/Exception/Forbidden.php
new file mode 100644
index 0000000000000000000000000000000000000000..5f0378cfc7405f688b1a77075ee62ba7bb18c850
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/Exception/Forbidden.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Dropbox Forbidden exception
+ * 
+ * @package Dropbox 
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+/**
+ * This exception is thrown when we receive the 403 forbidden response
+ */
+class Dropbox_Exception_Forbidden extends Dropbox_Exception {
+
+
+}
diff --git a/apps/files_external/3rdparty/Dropbox/Exception/NotFound.php b/apps/files_external/3rdparty/Dropbox/Exception/NotFound.php
new file mode 100644
index 0000000000000000000000000000000000000000..3deaf90d76bc1d6aff5ac0f3671f945c89d33947
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/Exception/NotFound.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Dropbox Not Found exception
+ * 
+ * @package Dropbox 
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+/**
+ * This exception is thrown when a non-existant uri is accessed.
+ * 
+ * Basically, this exception is used when we get back a 404.
+ */
+class Dropbox_Exception_NotFound extends Dropbox_Exception {
+
+
+}
diff --git a/apps/files_external/3rdparty/Dropbox/Exception/OverQuota.php b/apps/files_external/3rdparty/Dropbox/Exception/OverQuota.php
new file mode 100644
index 0000000000000000000000000000000000000000..86e5425dbd8a150c8fe622806837ce310cafa05e
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/Exception/OverQuota.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Dropbox Over Quota exception
+ * 
+ * @package Dropbox 
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+/**
+ * This exception is thrown when the operation required more space than the available quota.
+ * 
+ * Basically, this exception is used when we get back a 507.
+ */
+class Dropbox_Exception_OverQuota extends Dropbox_Exception {
+
+
+}
diff --git a/apps/files_external/3rdparty/Dropbox/Exception/RequestToken.php b/apps/files_external/3rdparty/Dropbox/Exception/RequestToken.php
new file mode 100644
index 0000000000000000000000000000000000000000..5b117f2c6b00a99a48305d457586940815cf559e
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/Exception/RequestToken.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Dropbox RequestToken exception
+ * 
+ * @package Dropbox 
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+/**
+ * This exception is thrown when an error occured during the request_token process.
+ */
+class Dropbox_Exception_RequestToken extends Dropbox_Exception {
+
+
+}
diff --git a/apps/files_external/3rdparty/Dropbox/LICENSE.txt b/apps/files_external/3rdparty/Dropbox/LICENSE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..cd3512acee6c33f90fcebbcfc778fa0c5c31c146
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/LICENSE.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2010 Rooftop Solutions
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/apps/files_external/3rdparty/Dropbox/OAuth.php b/apps/files_external/3rdparty/Dropbox/OAuth.php
new file mode 100644
index 0000000000000000000000000000000000000000..905cc2da1c6f8e95add3dc0a85b1410d98b952b2
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/OAuth.php
@@ -0,0 +1,151 @@
+<?php
+
+/**
+ * Dropbox OAuth
+ * 
+ * @package Dropbox 
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+
+/**
+ * This class is an abstract OAuth class.
+ *
+ * It must be extended by classes who wish to provide OAuth functionality
+ * using different libraries.
+ */
+abstract class Dropbox_OAuth {
+
+    /**
+     * After a user has authorized access, dropbox can redirect the user back
+     * to this url.
+     * 
+     * @var string
+     */
+    public $authorizeCallbackUrl = null; 
+   
+    /**
+     * Uri used to fetch request tokens 
+     * 
+     * @var string
+     */
+    const URI_REQUEST_TOKEN = 'https://api.dropbox.com/1/oauth/request_token';
+
+    /**
+     * Uri used to redirect the user to for authorization.
+     * 
+     * @var string
+     */
+    const URI_AUTHORIZE = 'https://www.dropbox.com/1/oauth/authorize';
+
+    /**
+     * Uri used to 
+     * 
+     * @var string
+     */
+    const URI_ACCESS_TOKEN = 'https://api.dropbox.com/1/oauth/access_token';
+
+    /**
+     * An OAuth request token. 
+     * 
+     * @var string 
+     */
+    protected $oauth_token = null;
+
+    /**
+     * OAuth token secret 
+     * 
+     * @var string 
+     */
+    protected $oauth_token_secret = null;
+
+
+    /**
+     * Constructor
+     * 
+     * @param string $consumerKey 
+     * @param string $consumerSecret 
+     */
+    abstract public function __construct($consumerKey, $consumerSecret);
+
+    /**
+     * Sets the request token and secret.
+     *
+     * The tokens can also be passed as an array into the first argument.
+     * The array must have the elements token and token_secret.
+     * 
+     * @param string|array $token 
+     * @param string $token_secret 
+     * @return void
+     */
+    public function setToken($token, $token_secret = null) {
+
+        if (is_array($token)) {
+            $this->oauth_token = $token['token'];
+            $this->oauth_token_secret = $token['token_secret'];
+        } else {
+            $this->oauth_token = $token;
+            $this->oauth_token_secret = $token_secret;
+        }
+
+    }
+
+    /**
+     * Returns the oauth request tokens as an associative array.
+     *
+     * The array will contain the elements 'token' and 'token_secret'.
+     * 
+     * @return array 
+     */
+    public function getToken() {
+
+        return array(
+            'token' => $this->oauth_token,
+            'token_secret' => $this->oauth_token_secret,
+        );
+
+    }
+
+    /**
+     * Returns the authorization url
+     * 
+     * @param string $callBack Specify a callback url to automatically redirect the user back 
+     * @return string 
+     */
+    public function getAuthorizeUrl($callBack = null) {
+        
+        // Building the redirect uri
+        $token = $this->getToken();
+        $uri = self::URI_AUTHORIZE . '?oauth_token=' . $token['token'];
+        if ($callBack) $uri.='&oauth_callback=' . $callBack;
+        return $uri;
+    }
+
+    /**
+     * Fetches a secured oauth url and returns the response body. 
+     * 
+     * @param string $uri 
+     * @param mixed $arguments 
+     * @param string $method 
+     * @param array $httpHeaders 
+     * @return string 
+     */
+    public abstract function fetch($uri, $arguments = array(), $method = 'GET', $httpHeaders = array()); 
+
+    /**
+     * Requests the OAuth request token.
+     * 
+     * @return array 
+     */
+    abstract public function getRequestToken(); 
+
+    /**
+     * Requests the OAuth access tokens.
+     *
+     * @return array
+     */
+    abstract public function getAccessToken(); 
+
+}
diff --git a/apps/files_external/3rdparty/Dropbox/OAuth/Consumer/Dropbox.php b/apps/files_external/3rdparty/Dropbox/OAuth/Consumer/Dropbox.php
new file mode 100644
index 0000000000000000000000000000000000000000..204a659de00653ec702cb27fedd7ade19653ddcd
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/OAuth/Consumer/Dropbox.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * HTTP OAuth Consumer
+ * 
+ * Adapted from halldirector's code in 
+ * http://code.google.com/p/dropbox-php/issues/detail?id=36#c5
+ * 
+ * @package Dropbox
+ * @copyright Copyright (C) 2011 Joe Constant / halldirector. All rights reserved.
+ * @author Joe Constant / halldirector
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+require_once 'HTTP/OAuth.php';
+require_once 'HTTP/OAuth/Consumer.php';
+
+/* 
+ * This class is to help work around aomw ssl issues.
+ */
+class Dropbox_OAuth_Consumer_Dropbox extends  HTTP_OAuth_Consumer
+{
+    public function getOAuthConsumerRequest()
+    {
+        if (!$this->consumerRequest instanceof HTTP_OAuth_Consumer_Request) {
+            $this->consumerRequest = new HTTP_OAuth_Consumer_Request;
+        }
+        
+        // TODO: Change this and add in code to validate the SSL cert.
+        // see https://github.com/bagder/curl/blob/master/lib/mk-ca-bundle.pl
+        $this->consumerRequest->setConfig(array(
+                    'ssl_verify_peer' => false, 
+                    'ssl_verify_host' => false
+                ));
+        
+        return $this->consumerRequest;
+    }
+}
diff --git a/apps/files_external/3rdparty/Dropbox/OAuth/Curl.php b/apps/files_external/3rdparty/Dropbox/OAuth/Curl.php
new file mode 100644
index 0000000000000000000000000000000000000000..b75b27bb3637363910676c04fc1fcd8886b3d7cf
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/OAuth/Curl.php
@@ -0,0 +1,282 @@
+<?php
+
+/**
+ * Dropbox OAuth
+ * 
+ * @package Dropbox 
+ * @copyright Copyright (C) 2011 Daniel Huesken
+ * @author Daniel Huesken (http://www.danielhuesken.de/)
+ * @license MIT
+ */
+
+/**
+ * This class is used to sign all requests to dropbox.
+ *
+ * This specific class uses WordPress WP_Http to authenticate.
+ */
+class Dropbox_OAuth_Curl extends Dropbox_OAuth {
+
+    /**
+     *
+     * @var string ConsumerKey
+     */
+    protected $consumerKey = null;
+    /**
+     *
+     * @var string ConsumerSecret
+     */
+    protected $consumerSecret = null;
+    /**
+     *
+     * @var string ProzessCallBack
+     */
+    public $ProgressFunction = false;
+	
+    /**
+     * Constructor
+     * 
+     * @param string $consumerKey 
+     * @param string $consumerSecret 
+     */
+    public function __construct($consumerKey, $consumerSecret) {
+        if (!function_exists('curl_exec')) 
+            throw new Dropbox_Exception('The PHP curl functions not available!');
+
+        $this->consumerKey = $consumerKey;
+        $this->consumerSecret = $consumerSecret;
+    }
+
+    /**
+     * Fetches a secured oauth url and returns the response body. 
+     * 
+     * @param string $uri 
+     * @param mixed $arguments 
+     * @param string $method 
+     * @param array $httpHeaders 
+     * @return string 
+     */
+    public function fetch($uri, $arguments = array(), $method = 'GET', $httpHeaders = array()) {
+		
+		$uri=str_replace('http://', 'https://', $uri); // all https, upload makes problems if not
+		if (is_string($arguments) and strtoupper($method) == 'POST') {
+		    preg_match("/\?file=(.*)$/i", $uri, $matches);
+			if (isset($matches[1])) {
+                $uri = str_replace($matches[0], "", $uri);
+                $filename = $matches[1];
+				$httpHeaders=array_merge($httpHeaders,$this->getOAuthHeader($uri, array("file" => $filename), $method));
+            }
+		} else {
+			$httpHeaders=array_merge($httpHeaders,$this->getOAuthHeader($uri, $arguments, $method));
+		}
+		$ch = curl_init();	
+		if (strtoupper($method) == 'POST') {
+			curl_setopt($ch, CURLOPT_URL, $uri);
+			curl_setopt($ch, CURLOPT_POST, true);
+// 			if (is_array($arguments))
+// 				$arguments=http_build_query($arguments);
+			curl_setopt($ch, CURLOPT_POSTFIELDS, $arguments);
+// 			$httpHeaders['Content-Length']=strlen($arguments);
+		} else {
+			curl_setopt($ch, CURLOPT_URL, $uri.'?'.http_build_query($arguments));
+			curl_setopt($ch, CURLOPT_POST, false);
+		}
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_TIMEOUT, 300);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
+//         curl_setopt($ch, CURLOPT_CAINFO, "rootca");
+		curl_setopt($ch, CURLOPT_FRESH_CONNECT, true);
+		//Build header
+		$headers = array();
+		foreach ($httpHeaders as $name => $value) {
+			$headers[] = "{$name}: $value";
+		}
+		curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+		if (!ini_get('safe_mode') && !ini_get('open_basedir'))
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true );
+		if (function_exists($this->ProgressFunction) and defined('CURLOPT_PROGRESSFUNCTION')) {
+			curl_setopt($ch, CURLOPT_NOPROGRESS, false);
+			curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, $this->ProgressFunction);
+			curl_setopt($ch, CURLOPT_BUFFERSIZE, 512);
+		}
+		$response=curl_exec($ch);
+		$errorno=curl_errno($ch);
+		$error=curl_error($ch);
+		$status=curl_getinfo($ch,CURLINFO_HTTP_CODE);
+		curl_close($ch);
+		
+		
+		if (!empty($errorno))
+			throw new Dropbox_Exception_NotFound('Curl error: ('.$errorno.') '.$error."\n");
+						
+		if ($status>=300) {
+			$body = json_decode($response,true);
+			switch ($status) {
+				// Not modified
+				case 304 :
+					return array(
+						'httpStatus' => 304,
+						'body' => null,
+					);
+					break;
+				case 403 :
+					throw new Dropbox_Exception_Forbidden('Forbidden.
+						This could mean a bad OAuth request, or a file or folder already existing at the target location.
+						' . $body["error"] . "\n");
+				case 404 :
+					throw new Dropbox_Exception_NotFound('Resource at uri: ' . $uri . ' could not be found. ' .
+							$body["error"] . "\n");
+				case 507 :
+					throw new Dropbox_Exception_OverQuota('This dropbox is full. ' .
+							$body["error"] . "\n");
+			}
+			if (!empty($body["error"]))
+				throw new Dropbox_Exception_RequestToken('Error: ('.$status.') '.$body["error"]."\n");	
+		}
+
+		return array(
+			'body' => $response,
+            'httpStatus' => $status
+        );
+    }
+
+    /**
+     * Returns named array with oauth parameters for further use
+     * @return array Array with oauth_ parameters
+     */
+    private function getOAuthBaseParams() {
+        $params['oauth_version'] = '1.0';
+        $params['oauth_signature_method'] = 'HMAC-SHA1';
+
+        $params['oauth_consumer_key'] = $this->consumerKey;
+        $tokens = $this->getToken();
+        if (isset($tokens['token']) && $tokens['token']) {
+            $params['oauth_token'] = $tokens['token'];
+        }
+        $params['oauth_timestamp'] = time();
+        $params['oauth_nonce'] = md5(microtime() . mt_rand());
+        return $params;
+    }
+
+    /**
+     * Creates valid Authorization header for OAuth, based on URI and Params
+     *
+     * @param string $uri
+     * @param array $params
+     * @param string $method GET or POST, standard is GET
+     * @param array $oAuthParams optional, pass your own oauth_params here
+     * @return array Array for request's headers section like
+     * array('Authorization' => 'OAuth ...');
+     */
+    private function getOAuthHeader($uri, $params, $method = 'GET', $oAuthParams = null) {
+        $oAuthParams = $oAuthParams ? $oAuthParams : $this->getOAuthBaseParams();
+
+        // create baseString to encode for the sent parameters
+        $baseString = $method . '&';
+        $baseString .= $this->oauth_urlencode($uri) . "&";
+
+        // OAuth header does not include GET-Parameters
+        $signatureParams = array_merge($params, $oAuthParams);
+
+        // sorting the parameters
+        ksort($signatureParams);
+
+        $encodedParams = array();
+        foreach ($signatureParams as $key => $value) {
+            $encodedParams[] = $this->oauth_urlencode($key) . '=' . $this->oauth_urlencode($value);
+        }
+
+        $baseString .= $this->oauth_urlencode(implode('&', $encodedParams));
+
+        // encode the signature
+        $tokens = $this->getToken();
+        $hash = $this->hash_hmac_sha1($this->consumerSecret.'&'.$tokens['token_secret'], $baseString);
+        $signature = base64_encode($hash);
+
+        // add signature to oAuthParams
+        $oAuthParams['oauth_signature'] = $signature;
+
+        $oAuthEncoded = array();
+        foreach ($oAuthParams as $key => $value) {
+            $oAuthEncoded[] = $key . '="' . $this->oauth_urlencode($value) . '"';
+        }
+
+        return array('Authorization' => 'OAuth ' . implode(', ', $oAuthEncoded));
+    }
+
+    /**
+     * Requests the OAuth request token.
+     *
+     * @return void 
+     */
+    public function getRequestToken() {
+        $result = $this->fetch(self::URI_REQUEST_TOKEN, array(), 'POST');
+        if ($result['httpStatus'] == "200") {
+            $tokens = array();
+            parse_str($result['body'], $tokens);
+            $this->setToken($tokens['oauth_token'], $tokens['oauth_token_secret']);
+            return $this->getToken();
+        } else {
+            throw new Dropbox_Exception_RequestToken('We were unable to fetch request tokens. This likely means that your consumer key and/or secret are incorrect.');
+        }
+    }
+
+    /**
+     * Requests the OAuth access tokens.
+     *
+     * This method requires the 'unauthorized' request tokens
+     * and, if successful will set the authorized request tokens.
+     * 
+     * @return void 
+     */
+    public function getAccessToken() {
+        $result = $this->fetch(self::URI_ACCESS_TOKEN, array(), 'POST');
+        if ($result['httpStatus'] == "200") {
+            $tokens = array();
+            parse_str($result['body'], $tokens);
+            $this->setToken($tokens['oauth_token'], $tokens['oauth_token_secret']);
+            return $this->getToken();
+        } else {
+            throw new Dropbox_Exception_RequestToken('We were unable to fetch request tokens. This likely means that your consumer key and/or secret are incorrect.');
+        }
+    }
+
+    /**
+     * Helper function to properly urlencode parameters.
+     * See http://php.net/manual/en/function.oauth-urlencode.php
+     *
+     * @param string $string
+     * @return string
+     */
+    private function oauth_urlencode($string) {
+        return str_replace('%E7', '~', rawurlencode($string));
+    }
+
+    /**
+     * Hash function for hmac_sha1; uses native function if available.
+     *
+     * @param string $key
+     * @param string $data
+     * @return string
+     */
+    private function hash_hmac_sha1($key, $data) {
+        if (function_exists('hash_hmac') && in_array('sha1', hash_algos())) {
+            return hash_hmac('sha1', $data, $key, true);
+        } else {
+            $blocksize = 64;
+            $hashfunc = 'sha1';
+            if (strlen($key) > $blocksize) {
+                $key = pack('H*', $hashfunc($key));
+            }
+
+            $key = str_pad($key, $blocksize, chr(0x00));
+            $ipad = str_repeat(chr(0x36), $blocksize);
+            $opad = str_repeat(chr(0x5c), $blocksize);
+            $hash = pack('H*', $hashfunc(( $key ^ $opad ) . pack('H*', $hashfunc(($key ^ $ipad) . $data))));
+
+            return $hash;
+        }
+    }
+	
+
+}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/Dropbox/README.md b/apps/files_external/3rdparty/Dropbox/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..54e05db762b723c0722edaa57c13080250cb290c
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/README.md
@@ -0,0 +1,31 @@
+Dropbox-php
+===========
+
+This PHP library allows you to easily integrate dropbox with PHP.
+
+The following PHP extension is required:
+
+* json
+
+The library makes use of OAuth. At the moment you can use either of these libraries:
+
+[PHP OAuth extension](http://pecl.php.net/package/oauth)  
+[PEAR's HTTP_OAUTH package](http://pear.php.net/package/http_oauth)  
+
+The extension is recommended, but if you can't install php extensions you should go for the pear package.  
+Installing
+----------
+
+    pear channel-discover pear.dropbox-php.com
+    pear install dropbox-php/Dropbox-alpha
+
+Documentation
+-------------
+Check out the [documentation](http://www.dropbox-php.com/docs).  
+
+Questions?
+----------
+
+[Dropbox-php Mailing list](http://groups.google.com/group/dropbox-php)  
+[Official Dropbox developer forum](http://forums.dropbox.com/forum.php?id=5)
+ 
diff --git a/apps/files_external/3rdparty/Dropbox/autoload.php b/apps/files_external/3rdparty/Dropbox/autoload.php
new file mode 100644
index 0000000000000000000000000000000000000000..5388ea6334a23a3e318a0e967404cafdd8827f47
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/autoload.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * This file registers a new autoload function using spl_autoload_register. 
+ *
+ * @package Dropbox 
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+/**
+ * Autoloader function
+ *
+ * @param $className string
+ * @return void
+ */
+function Dropbox_autoload($className) {
+
+    if(strpos($className,'Dropbox_')===0) {
+
+        include dirname(__FILE__) . '/' . str_replace('_','/',substr($className,8)) . '.php';
+
+    }
+
+}
+
+spl_autoload_register('Dropbox_autoload');
+
diff --git a/apps/files_external/3rdparty/smb4php/smb.php b/apps/files_external/3rdparty/smb4php/smb.php
new file mode 100644
index 0000000000000000000000000000000000000000..e7d1dfa09fec9ba8f42c3ba1f0290191231fd472
--- /dev/null
+++ b/apps/files_external/3rdparty/smb4php/smb.php
@@ -0,0 +1,484 @@
+<?php
+###################################################################
+# smb.php
+# This class implements a SMB stream wrapper based on 'smbclient'
+#
+# Date: lun oct 22 10:35:35 CEST 2007
+#
+# Homepage: http://www.phpclasses.org/smb4php
+#
+# Copyright (c) 2007 Victor M. Varela <vmvarela@gmail.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+###################################################################
+
+define ('SMB4PHP_VERSION', '0.8');
+
+###################################################################
+# CONFIGURATION SECTION - Change for your needs
+###################################################################
+
+define ('SMB4PHP_SMBCLIENT', 'smbclient');
+define ('SMB4PHP_SMBOPTIONS', 'TCP_NODELAY IPTOS_LOWDELAY SO_KEEPALIVE SO_RCVBUF=8192 SO_SNDBUF=8192');
+define ('SMB4PHP_AUTHMODE', 'arg'); # set to 'env' to use USER enviroment variable
+
+###################################################################
+# SMB - commands that does not need an instance
+###################################################################
+
+$GLOBALS['__smb_cache'] = array ('stat' => array (), 'dir' => array ());
+
+class smb {
+
+	function parse_url ($url) {
+		$pu = parse_url (trim($url));
+		foreach (array ('domain', 'user', 'pass', 'host', 'port', 'path') as $i) {
+			if (! isset($pu[$i])) {
+				$pu[$i] = '';
+			}
+		}
+		if (count ($userdomain = explode (';', urldecode ($pu['user']))) > 1) {
+			@list ($pu['domain'], $pu['user']) = $userdomain;
+		}
+		$path = preg_replace (array ('/^\//', '/\/$/'), '', urldecode ($pu['path']));
+		list ($pu['share'], $pu['path']) = (preg_match ('/^([^\/]+)\/(.*)/', $path, $regs))
+			? array ($regs[1], preg_replace ('/\//', '\\', $regs[2]))
+			: array ($path, '');
+		$pu['type'] = $pu['path'] ? 'path' : ($pu['share'] ? 'share' : ($pu['host'] ? 'host' : '**error**'));
+		if (! ($pu['port'] = intval(@$pu['port']))) {
+			$pu['port'] = 139;
+		}
+
+		// decode user and password
+		$pu['user'] = urldecode($pu['user']);
+		$pu['pass'] = urldecode($pu['pass']);
+		return $pu;
+	}
+
+
+	function look ($purl) {
+		return smb::client ('-L ' . escapeshellarg ($purl['host']), $purl);
+	}
+
+
+	function execute ($command, $purl) {
+		return smb::client ('-d 0 '
+				. escapeshellarg ('//' . $purl['host'] . '/' . $purl['share'])
+				. ' -c ' . escapeshellarg ($command), $purl
+		);
+	}
+
+	function client ($params, $purl) {
+
+		static $regexp = array (
+			'^added interface ip=(.*) bcast=(.*) nmask=(.*)$' => 'skip',
+			'Anonymous login successful' => 'skip',
+			'^Domain=\[(.*)\] OS=\[(.*)\] Server=\[(.*)\]$' => 'skip',
+			'^\tSharename[ ]+Type[ ]+Comment$' => 'shares',
+			'^\t---------[ ]+----[ ]+-------$' => 'skip',
+			'^\tServer   [ ]+Comment$' => 'servers',
+			'^\t---------[ ]+-------$' => 'skip',
+			'^\tWorkgroup[ ]+Master$' => 'workg',
+			'^\t(.*)[ ]+(Disk|IPC)[ ]+IPC.*$' => 'skip',
+			'^\tIPC\\\$(.*)[ ]+IPC' => 'skip',
+			'^\t(.*)[ ]+(Disk)[ ]+(.*)$' => 'share',
+			'^\t(.*)[ ]+(Printer)[ ]+(.*)$' => 'skip',
+			'([0-9]+) blocks of size ([0-9]+)\. ([0-9]+) blocks available' => 'skip',
+			'Got a positive name query response from ' => 'skip',
+			'^(session setup failed): (.*)$' => 'error',
+			'^(.*): ERRSRV - ERRbadpw' => 'error',
+			'^Error returning browse list: (.*)$' => 'error',
+			'^tree connect failed: (.*)$' => 'error',
+			'^(Connection to .* failed)(.*)$' => 'error-connect',
+			'^NT_STATUS_(.*) ' => 'error',
+			'^NT_STATUS_(.*)\$' => 'error',
+			'ERRDOS - ERRbadpath \((.*).\)' => 'error',
+			'cd (.*): (.*)$' => 'error',
+			'^cd (.*): NT_STATUS_(.*)' => 'error',
+			'^\t(.*)$' => 'srvorwg',
+			'^([0-9]+)[ ]+([0-9]+)[ ]+(.*)$' => 'skip',
+			'^Job ([0-9]+) cancelled' => 'skip',
+			'^[ ]+(.*)[ ]+([0-9]+)[ ]+(Mon|Tue|Wed|Thu|Fri|Sat|Sun)[ ](Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)[ ]+([0-9]+)[ ]+([0-9]{2}:[0-9]{2}:[0-9]{2})[ ]([0-9]{4})$' => 'files',
+			'^message start: ERRSRV - (ERRmsgoff)' => 'error'
+		);
+
+		if (SMB4PHP_AUTHMODE == 'env') {
+			putenv("USER={$purl['user']}%{$purl['pass']}");
+			$auth = '';
+		} else {
+			$auth = ($purl['user'] <> '' ? (' -U ' . escapeshellarg ($purl['user'] . '%' . $purl['pass'])) : '');
+		}
+		if ($purl['domain'] <> '') {
+			$auth .= ' -W ' . escapeshellarg ($purl['domain']);
+		}
+		$port = ($purl['port'] <> 139 ? ' -p ' . escapeshellarg ($purl['port']) : '');
+		$options = '-O ' . escapeshellarg(SMB4PHP_SMBOPTIONS);
+
+		// this put env is necessary to read the output of smbclient correctly
+		$old_locale = getenv('LC_ALL');
+		putenv('LC_ALL=en_US.UTF-8');
+		$output = popen (SMB4PHP_SMBCLIENT." -N {$auth} {$options} {$port} {$options} {$params} 2>/dev/null", 'r');
+		$info = array ();
+		$info['info']= array ();
+		$mode = '';
+		while ($line = fgets ($output, 4096)) {
+			list ($tag, $regs, $i) = array ('skip', array (), array ());
+			reset ($regexp);
+			foreach ($regexp as $r => $t) if (preg_match ('/'.$r.'/', $line, $regs)) {
+				$tag = $t;
+				break;
+			}
+			switch ($tag) {
+				case 'skip':    continue;
+				case 'shares':  $mode = 'shares';     break;
+				case 'servers': $mode = 'servers';    break;
+				case 'workg':   $mode = 'workgroups'; break;
+				case 'share':
+					list($name, $type) = array (
+						trim(substr($line, 1, 15)),
+						trim(strtolower(substr($line, 17, 10)))
+					);
+					$i = ($type <> 'disk' && preg_match('/^(.*) Disk/', $line, $regs))
+						? array(trim($regs[1]), 'disk')
+						: array($name, 'disk');
+					break;
+				case 'srvorwg':
+					list ($name, $master) = array (
+						strtolower(trim(substr($line,1,21))),
+						strtolower(trim(substr($line, 22)))
+					);
+					$i = ($mode == 'servers') ? array ($name, "server") : array ($name, "workgroup", $master);
+					break;
+				case 'files':
+					list ($attr, $name) = preg_match ("/^(.*)[ ]+([D|A|H|S|R]+)$/", trim ($regs[1]), $regs2)
+						? array (trim ($regs2[2]), trim ($regs2[1]))
+						: array ('', trim ($regs[1]));
+					list ($his, $im) = array (
+						explode(':', $regs[6]), 1 + strpos("JanFebMarAprMayJunJulAugSepOctNovDec", $regs[4]) / 3);
+					$i = ($name <> '.' && $name <> '..')
+						? array (
+							$name,
+							(strpos($attr,'D') === FALSE) ? 'file' : 'folder',
+							'attr' => $attr,
+							'size' => intval($regs[2]),
+							'time' => mktime ($his[0], $his[1], $his[2], $im, $regs[5], $regs[7])
+						)
+						: array();
+					break;
+				case 'error':
+					if(substr($regs[0],0,22)=='NT_STATUS_NO_SUCH_FILE'){
+						return false;
+					}elseif(substr($regs[0],0,31)=='NT_STATUS_OBJECT_NAME_COLLISION'){
+						return false;
+					}elseif(substr($regs[0],0,31)=='NT_STATUS_OBJECT_PATH_NOT_FOUND'){
+						return false;
+					}elseif(substr($regs[0],0,29)=='NT_STATUS_FILE_IS_A_DIRECTORY'){
+						return false;
+					}
+					trigger_error($regs[0].' params('.$params.')', E_USER_ERROR);
+				case 'error-connect':
+					return false;
+			}
+			if ($i) switch ($i[1]) {
+				case 'file':
+				case 'folder':    $info['info'][$i[0]] = $i;
+				case 'disk':
+				case 'server':
+				case 'workgroup': $info[$i[1]][] = $i[0];
+			}
+		}
+		pclose($output);
+
+
+		// restore previous locale
+		if ($old_locale===false) {
+			putenv('LC_ALL');
+		} else {
+			putenv('LC_ALL='.$old_locale);
+		}
+
+		return $info;
+	}
+
+
+	# stats
+
+	function url_stat ($url, $flags = STREAM_URL_STAT_LINK) {
+		if ($s = smb::getstatcache($url)) {
+			return $s;
+		}
+		list ($stat, $pu) = array (false, smb::parse_url ($url));
+		switch ($pu['type']) {
+			case 'host':
+				if ($o = smb::look ($pu))
+					$stat = stat ("/tmp");
+				else
+					trigger_error ("url_stat(): list failed for host '{$pu['host']}'", E_USER_WARNING);
+				break;
+			case 'share':
+				if ($o = smb::look ($pu)) {
+					$found = FALSE;
+					$lshare = strtolower ($pu['share']);  # fix by Eric Leung
+					foreach ($o['disk'] as $s) if ($lshare == strtolower($s)) {
+						$found = TRUE;
+						$stat = stat ("/tmp");
+						break;
+					}
+					if (! $found)
+						trigger_error ("url_stat(): disk resource '{$lshare}' not found in '{$pu['host']}'", E_USER_WARNING);
+				}
+				break;
+			case 'path':
+				if ($o = smb::execute ('dir "'.$pu['path'].'"', $pu)) {
+					$p = explode('\\', $pu['path']);
+					$name = $p[count($p)-1];
+					if (isset ($o['info'][$name])) {
+						$stat = smb::addstatcache ($url, $o['info'][$name]);
+					} else {
+						trigger_error ("url_stat(): path '{$pu['path']}' not found", E_USER_WARNING);
+					}
+				} else {
+					return false;
+// 					trigger_error ("url_stat(): dir failed for path '{$pu['path']}'", E_USER_WARNING);
+				}
+				break;
+			default: trigger_error ('error in URL', E_USER_ERROR);
+		}
+		return $stat;
+	}
+
+	function addstatcache ($url, $info) {
+		$url = str_replace('//', '/', $url);
+		$url = rtrim($url, '/');
+		global $__smb_cache;
+		$is_file = (strpos ($info['attr'],'D') === FALSE);
+		$s = ($is_file) ? stat ('/etc/passwd') : stat ('/tmp');
+		$s[7] = $s['size'] = $info['size'];
+		$s[8] = $s[9] = $s[10] = $s['atime'] = $s['mtime'] = $s['ctime'] = $info['time'];
+		return $__smb_cache['stat'][$url] = $s;
+	}
+
+	function getstatcache ($url) {
+		$url = str_replace('//', '/', $url);
+		$url = rtrim($url, '/');
+		global $__smb_cache;
+		return isset ($__smb_cache['stat'][$url]) ? $__smb_cache['stat'][$url] : FALSE;
+	}
+
+	function clearstatcache ($url='') {
+		$url = str_replace('//', '/', $url);
+		$url = rtrim($url, '/');
+		global $__smb_cache;
+		if ($url == '') $__smb_cache['stat'] = array (); else unset ($__smb_cache['stat'][$url]);
+	}
+
+
+	# commands
+
+	function unlink ($url) {
+		$pu = smb::parse_url($url);
+		if ($pu['type'] <> 'path') trigger_error('unlink(): error in URL', E_USER_ERROR);
+		smb::clearstatcache ($url);
+		smb_stream_wrapper::cleardircache (dirname($url));
+		return smb::execute ('del "'.$pu['path'].'"', $pu);
+	}
+
+	function rename ($url_from, $url_to) {
+		list ($from, $to) = array (smb::parse_url($url_from), smb::parse_url($url_to));
+		if ($from['host'] <> $to['host'] ||
+			$from['share'] <> $to['share'] ||
+			$from['user'] <> $to['user'] ||
+			$from['pass'] <> $to['pass'] ||
+			$from['domain'] <> $to['domain']) {
+			trigger_error('rename(): FROM & TO must be in same server-share-user-pass-domain', E_USER_ERROR);
+		}
+		if ($from['type'] <> 'path' || $to['type'] <> 'path') {
+			trigger_error('rename(): error in URL', E_USER_ERROR);
+		}
+		smb::clearstatcache ($url_from);
+		return smb::execute ('rename "'.$from['path'].'" "'.$to['path'].'"', $to);
+	}
+
+	function mkdir ($url, $mode, $options) {
+		$pu = smb::parse_url($url);
+		if ($pu['type'] <> 'path') trigger_error('mkdir(): error in URL', E_USER_ERROR);
+		return smb::execute ('mkdir "'.$pu['path'].'"', $pu)!==false;
+	}
+
+	function rmdir ($url) {
+		$pu = smb::parse_url($url);
+		if ($pu['type'] <> 'path') trigger_error('rmdir(): error in URL', E_USER_ERROR);
+		smb::clearstatcache ($url);
+		smb_stream_wrapper::cleardircache (dirname($url));
+		return smb::execute ('rmdir "'.$pu['path'].'"', $pu)!==false;
+	}
+
+}
+
+###################################################################
+# SMB_STREAM_WRAPPER - class to be registered for smb:// URLs
+###################################################################
+
+class smb_stream_wrapper extends smb {
+
+	# variables
+
+	private $stream, $url, $parsed_url = array (), $mode, $tmpfile;
+	private $need_flush = FALSE;
+	private $dir = array (), $dir_index = -1;
+
+
+	# directories
+
+	function dir_opendir ($url, $options) {
+		if ($d = $this->getdircache ($url)) {
+			$this->dir = $d;
+			$this->dir_index = 0;
+			return TRUE;
+		}
+		$pu = smb::parse_url ($url);
+		switch ($pu['type']) {
+			case 'host':
+				if ($o = smb::look ($pu)) {
+					$this->dir = $o['disk'];
+					$this->dir_index = 0;
+				} else {
+					trigger_error ("dir_opendir(): list failed for host '{$pu['host']}'", E_USER_WARNING);
+					return false;
+				}
+				break;
+			case 'share':
+			case 'path':
+				if (is_array($o = smb::execute ('dir "'.$pu['path'].'\*"', $pu))) {
+					$this->dir = array_keys($o['info']);
+					$this->dir_index = 0;
+					$this->adddircache ($url, $this->dir);
+					if(substr($url,-1,1)=='/'){
+						$url=substr($url,0,-1);
+					}
+					foreach ($o['info'] as $name => $info) {
+						smb::addstatcache($url . '/' . $name, $info);
+					}
+				} else {
+					trigger_error ("dir_opendir(): dir failed for path '".$pu['path']."'", E_USER_WARNING);
+					return false;
+				}
+				break;
+			default:
+				trigger_error ('dir_opendir(): error in URL', E_USER_ERROR);
+				return false;
+		}
+		return TRUE;
+	}
+
+	function dir_readdir () {
+		return ($this->dir_index < count($this->dir)) ? $this->dir[$this->dir_index++] : FALSE;
+	}
+
+	function dir_rewinddir () { $this->dir_index = 0; }
+
+	function dir_closedir () { $this->dir = array(); $this->dir_index = -1; return TRUE; }
+
+
+	# cache
+
+	function adddircache ($url, $content) {
+		$url = str_replace('//', '/', $url);
+		$url = rtrim($url, '/');
+		global $__smb_cache;
+		return $__smb_cache['dir'][$url] = $content;
+	}
+
+	function getdircache ($url) {
+		$url = str_replace('//', '/', $url);
+		$url = rtrim($url, '/');
+		global $__smb_cache;
+		return isset ($__smb_cache['dir'][$url]) ? $__smb_cache['dir'][$url] : FALSE;
+	}
+
+	function cleardircache ($url='') {
+		$url = str_replace('//', '/', $url);
+		$url = rtrim($url, '/');
+		global $__smb_cache;
+		if ($url == ''){
+			$__smb_cache['dir'] = array ();
+		}else{
+			unset ($__smb_cache['dir'][$url]);
+		}
+	}
+
+
+	# streams
+
+	function stream_open ($url, $mode, $options, $opened_path) {
+		$this->url = $url;
+		$this->mode = $mode;
+		$this->parsed_url = $pu = smb::parse_url($url);
+		if ($pu['type'] <> 'path') trigger_error('stream_open(): error in URL', E_USER_ERROR);
+		switch ($mode) {
+			case 'r':
+			case 'r+':
+			case 'rb':
+			case 'a':
+			case 'a+':  $this->tmpfile = tempnam('/tmp', 'smb.down.');
+				smb::execute ('get "'.$pu['path'].'" "'.$this->tmpfile.'"', $pu);
+				break;
+			case 'w':
+			case 'w+':
+			case 'wb':
+			case 'x':
+			case 'x+':  $this->cleardircache();
+				$this->tmpfile = tempnam('/tmp', 'smb.up.');
+				$this->need_flush=true;
+		}
+		$this->stream = fopen ($this->tmpfile, $mode);
+		return TRUE;
+	}
+
+	function stream_close () { return fclose($this->stream); }
+
+	function stream_read ($count) { return fread($this->stream, $count); }
+
+	function stream_write ($data) { $this->need_flush = TRUE; return fwrite($this->stream, $data); }
+
+	function stream_eof () { return feof($this->stream); }
+
+	function stream_tell () { return ftell($this->stream); }
+
+	function stream_seek ($offset, $whence=null) { return fseek($this->stream, $offset, $whence); }
+
+	function stream_flush () {
+		if ($this->mode <> 'r' && $this->need_flush) {
+			smb::clearstatcache ($this->url);
+			smb::execute ('put "'.$this->tmpfile.'" "'.$this->parsed_url['path'].'"', $this->parsed_url);
+			$this->need_flush = FALSE;
+		}
+	}
+
+	function stream_stat () { return smb::url_stat ($this->url); }
+
+	function __destruct () {
+		if ($this->tmpfile <> '') {
+			if ($this->need_flush) $this->stream_flush ();
+			unlink ($this->tmpfile);
+
+		}
+	}
+
+}
+
+###################################################################
+# Register 'smb' protocol !
+###################################################################
+
+stream_wrapper_register('smb', 'smb_stream_wrapper')
+	or die ('Failed to register protocol');
diff --git a/apps/files_external/l10n/zh_CN.GB2312.php b/apps/files_external/l10n/zh_CN.GB2312.php
deleted file mode 100644
index 3633de6314e2057deaa31e7fbbf863f124d88b74..0000000000000000000000000000000000000000
--- a/apps/files_external/l10n/zh_CN.GB2312.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Access granted" => "已授予权限",
-"Error configuring Dropbox storage" => "配置 Dropbox 存储出错",
-"Grant access" => "授予权限",
-"Please provide a valid Dropbox app key and secret." => "请提供一个有效的 Dropbox app key 和 secret。",
-"Error configuring Google Drive storage" => "配置 Google Drive 存储失败",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>注意：</b>“SMB客户端”未安装。CIFS/SMB分享不可用。请向您的系统管理员请求安装该客户端。",
-"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>注意：</b>PHP的FTP支持尚未启用或未安装。FTP分享不可用。请向您的系统管理员请求安装。",
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>警告：</b> PHP 的 Curl 支持没有安装或打开。挂载 ownCloud、WebDAV 或 Google Drive 的功能将不可用。请询问您的系统管理员去安装它。",
-"External Storage" => "外部存储",
-"Folder name" => "文件夹名",
-"External storage" => "外部存储",
-"Configuration" => "配置",
-"Options" => "选项",
-"Applicable" => "可应用",
-"Add storage" => "扩容",
-"None set" => "未设置",
-"All Users" => "所有用户",
-"Groups" => "群组",
-"Users" => "用户",
-"Delete" => "删除",
-"Enable User External Storage" => "启用用户外部存储",
-"Allow users to mount their own external storage" => "允许用户挂载他们的外部存储",
-"SSL root certificates" => "SSL 根证书",
-"Import Root Certificate" => "导入根证书"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index 081c54788814788ba2d7cd63142dbb08ba103543..b6deab6e5a712e93805cc6ad2f97092e82268b05 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -22,7 +22,7 @@
 
 namespace OC\Files\Storage;
 
-require_once 'Dropbox/autoload.php';
+require_once __DIR__ . '/../3rdparty/Dropbox/autoload.php';
 
 class Dropbox extends \OC\Files\Storage\Common {
 
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index dc4e02731f1431ee8a66f6e94457bd7370f0bcf8..8e7a28fba1ad0a46cc3702c2916363d8ff6c3767 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -8,7 +8,7 @@
 
 namespace OC\Files\Storage;
 
-require_once 'smb4php/smb.php';
+require_once __DIR__ . '/../3rdparty/smb4php/smb.php';
 
 class SMB extends \OC\Files\Storage\StreamWrapper{
 	private $password;
diff --git a/apps/files_sharing/l10n/zh_CN.GB2312.php b/apps/files_sharing/l10n/zh_CN.GB2312.php
deleted file mode 100644
index 5c426672c886b455c8bcda966ab428b5d34c1a46..0000000000000000000000000000000000000000
--- a/apps/files_sharing/l10n/zh_CN.GB2312.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-$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" => "项目已经移除",
-"the link expired" => "链接已过期",
-"sharing is disabled" => "分享已经被禁用",
-"For more info, please ask the person who sent this link." => "欲了解更多信息，请联系将此链接发送给你的人。",
-"%s shared the folder %s with you" => "%s 与您分享了文件夹 %s",
-"%s shared the file %s with you" => "%s 与您分享了文件 %s",
-"Download" => "下载",
-"Upload" => "上传",
-"Cancel upload" => "取消上传",
-"No preview available for" => "没有预览可用于"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php
index b950cbf8c9ec086644cf615e106988e347ec7125..56d67ea7ce71f7c22f1f092e40549d7da4ace4f8 100644
--- a/apps/files_sharing/l10n/zh_TW.php
+++ b/apps/files_sharing/l10n/zh_TW.php
@@ -1,7 +1,14 @@
 <?php
 $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" => "項目已經移除",
+"the link expired" => "連結過期",
+"sharing is disabled" => "分享功能已停用",
+"For more info, please ask the person who sent this link." => "請詢問告訴您此連結的人以瞭解更多",
 "%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/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 7384b094cb04dd74049f4394ce5429622a85c1e2..d91acbbb2bdb708d2de8bf58705c667fe536a23e 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -362,9 +362,13 @@ class Shared extends \OC\Files\Storage\Common {
 				case 'xb':
 				case 'a':
 				case 'ab':
-					if (!$this->isUpdatable($path)) {
-						return false;
-					}
+				$exists = $this->file_exists($path);
+				if ($exists && !$this->isUpdatable($path)) {
+					return false;
+				}
+				if (!$exists && !$this->isCreatable(dirname($path))) {
+					return false;
+				}
 			}
 			$info = array(
 				'target' => $this->sharedFolder.$path,
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index b14a7240cbe5d0c211b9665492d302136b8e6428..40c0bdb382945b3d611a20e16c04516f60d02c3e 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -20,6 +20,7 @@ $(document).ready(function() {
 						OC.dialogs.alert(result.data.message, t('core', 'Error'));
 					}
 					enableActions();
+					FileList.updateFileSummary();
 				});
 
 			});
@@ -48,6 +49,7 @@ $(document).ready(function() {
 						OC.dialogs.alert(result.data.message, t('core', 'Error'));
 					}
 					enableActions();
+					FileList.updateFileSummary();
 				});
 
 			});
diff --git a/apps/files_trashbin/l10n/el.php b/apps/files_trashbin/l10n/el.php
index 759e5299e4200c58acca5df8a0801e1d5f2f5ba8..939c7fed6143e7879254bf7f1ec9eece441fd298 100644
--- a/apps/files_trashbin/l10n/el.php
+++ b/apps/files_trashbin/l10n/el.php
@@ -8,8 +8,8 @@ $TRANSLATIONS = array(
 "Delete permanently" => "Μόνιμη διαγραφή",
 "Name" => "Όνομα",
 "Deleted" => "Διαγράφηκε",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("","%n φάκελοι"),
+"_%n file_::_%n files_" => array("","%n αρχεία"),
 "restored" => "έγινε επαναφορά",
 "Nothing in here. Your trash bin is empty!" => "Δεν υπάρχει τίποτα εδώ. Ο κάδος σας είναι άδειος!",
 "Restore" => "Επαναφορά",
diff --git a/apps/files_trashbin/l10n/zh_CN.GB2312.php b/apps/files_trashbin/l10n/zh_CN.GB2312.php
deleted file mode 100644
index eaa97bb1b6ff7730c4a3b9841d27e140b5e73996..0000000000000000000000000000000000000000
--- a/apps/files_trashbin/l10n/zh_CN.GB2312.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "出错",
-"Delete permanently" => "永久删除",
-"Name" => "名称",
-"_%n folder_::_%n folders_" => array("%n 个文件夹"),
-"_%n file_::_%n files_" => array("%n 个文件"),
-"Restore" => "恢复",
-"Delete" => "删除",
-"Deleted Files" => "删除的文件"
-);
-$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 ab6b75c57848602a3621eda654ae14f73015fc81..2dfc484fc7faa60b4e95adedb2aa91ec4c8303ce 100644
--- a/apps/files_trashbin/l10n/zh_TW.php
+++ b/apps/files_trashbin/l10n/zh_TW.php
@@ -1,17 +1,18 @@
 <?php
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "無法永久刪除 %s",
-"Couldn't restore %s" => "無法復原 %s",
-"perform restore operation" => "進行復原動作",
+"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(""),
+"_%n folder_::_%n folders_" => array("%n 個資料夾"),
+"_%n file_::_%n files_" => array("%n 個檔案"),
+"restored" => "已還原",
 "Nothing in here. Your trash bin is empty!" => "您的垃圾桶是空的！",
-"Restore" => "復原",
+"Restore" => "還原",
 "Delete" => "刪除",
 "Deleted Files" => "已刪除的檔案"
 );
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 323f25eac2fb5a65ce1bc8326994a417df31c135..880832f9afa1f8606d7208925a76c2cf5a7579d3 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -72,11 +72,6 @@ class Trashbin {
 		$mime = $view->getMimeType('files' . $file_path);
 
 		if ($view->is_dir('files' . $file_path)) {
-			$dirContent = $view->getDirectoryContent('files' . $file_path);
-			// no need to move empty folders to the trash bin
-			if (empty($dirContent)) {
-				return true;
-			}
 			$type = 'dir';
 		} else {
 			$type = 'file';
@@ -689,7 +684,7 @@ class Trashbin {
 			}
 		}
 	}
-	
+
 	/**
 	 * clean up the trash bin
 	 * @param current size of the trash bin
@@ -892,16 +887,17 @@ class Trashbin {
 		//Listen to post write hook
 		\OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA\Files_Trashbin\Hooks", "post_write_hook");
 	}
-	
+
 	/**
 	 * @brief check if trash bin is empty for a given user
 	 * @param string $user
 	 */
 	public static function isEmpty($user) {
 
-		$trashSize = self::getTrashbinSize($user);
+		$view = new \OC\Files\View('/' . $user . '/files_trashbin');
+		$content = $view->getDirectoryContent('/files');
 
-		if ($trashSize !== false && $trashSize > 0) {
+		if ($content) {
 			return false;
 		}
 
diff --git a/apps/files_versions/l10n/zh_CN.GB2312.php b/apps/files_versions/l10n/zh_CN.GB2312.php
deleted file mode 100644
index de340d6dc9499818f89fdb5ccb0b0261eee2468b..0000000000000000000000000000000000000000
--- a/apps/files_versions/l10n/zh_CN.GB2312.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not revert: %s" => "无法恢复：%s",
-"Versions" => "版本",
-"Failed to revert {file} to revision {timestamp}." => "无法恢复文件  {file} 到 版本 {timestamp}。",
-"More versions..." => "更多版本",
-"No other versions available" => "没有其他可用版本",
-"Restore" => "恢复"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/zh_TW.php b/apps/files_versions/l10n/zh_TW.php
index 55a3dca3c3289965f3d343c8a6c94eafd8befa5a..9b8900fd8e1395e248f06f9311654270a7b3928b 100644
--- a/apps/files_versions/l10n/zh_TW.php
+++ b/apps/files_versions/l10n/zh_TW.php
@@ -2,6 +2,9 @@
 $TRANSLATIONS = array(
 "Could not revert: %s" => "無法還原：%s",
 "Versions" => "版本",
+"Failed to revert {file} to revision {timestamp}." => "無法還原檔案 {file} 至版本 {timestamp}",
+"More versions..." => "更多版本…",
+"No other versions available" => "沒有其他版本了",
 "Restore" => "復原"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index 338317baad7b537a07d82037c888abdf5cc64416..455ad62d84c9678eefcfe530a55cde62d70e1e50 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -30,8 +30,11 @@ $TRANSLATIONS = array(
 "Password" => "Contrasenya",
 "For anonymous access, leave DN and Password empty." => "Per un accés anònim, deixeu la DN i la contrasenya en blanc.",
 "User Login Filter" => "Filtre d'inici de sessió d'usuari",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Defineix el filtre a aplicar quan s'intenta iniciar la sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió. Per exemple: \"uid=%%uid\"",
 "User List Filter" => "Llista de filtres d'usuari",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Defineix el filtre a aplicar quan es mostren usuaris (no textos variables). Per exemple: \"objectClass=person\"",
 "Group Filter" => "Filtre de grup",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Defineix el filtre a aplicar quan es mostren grups (no textos variables). Per exemple: \"objectClass=posixGroup\"",
 "Connection Settings" => "Arranjaments de connexió",
 "Configuration Active" => "Configuració activa",
 "When unchecked, this configuration will be skipped." => "Si està desmarcat, aquesta configuració s'ometrà.",
@@ -45,6 +48,7 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "No ho useu adicionalment per a conexions LDAPS, fallarà.",
 "Case insensitve LDAP server (Windows)" => "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)",
 "Turn off SSL certificate validation." => "Desactiva la validació de certificat SSL.",
+"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." => "No es recomana, useu-ho només com a prova! Importeu el certificat SSL del servidor LDAP al servidor %s només si la connexió funciona amb aquesta opció.",
 "Cache Time-To-Live" => "Memòria de cau Time-To-Live",
 "in seconds. A change empties the cache." => "en segons. Un canvi buidarà la memòria de cau.",
 "Directory Settings" => "Arranjaments de carpetes",
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index 9f4c31c068ba118864cc4b118cd79fce8028ea55..9109a8c710a82e09152ca0ec3a72ebb0940c6b04 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -30,11 +30,11 @@ $TRANSLATIONS = array(
 "Password" => "Heslo",
 "For anonymous access, leave DN and Password empty." => "Pro anonymní přístup ponechte údaje DN and heslo prázdné.",
 "User Login Filter" => "Filtr přihlášení uživatelů",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Určuje použitý filtr, při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad \"uid=%%uid\"",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Určuje použitý filtr při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad: \"uid=%%uid\"",
 "User List Filter" => "Filtr seznamu uživatelů",
-"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Určuje použitý filtr pro získávaní uživatelů (bez zástupných znaků). Příklad: \"objectClass=person\"",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Určuje použitý filtr při získávání uživatelů (bez zástupných znaků). Příklad: \"objectClass=person\"",
 "Group Filter" => "Filtr skupin",
-"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Určuje použitý filtr, pro získávaní skupin (bez zástupných znaků). Příklad: \"objectClass=posixGroup\"",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Určuje použitý filtr při získávání skupin (bez zástupných znaků). Příklad: \"objectClass=posixGroup\"",
 "Connection Settings" => "Nastavení spojení",
 "Configuration Active" => "Nastavení aktivní",
 "When unchecked, this configuration will be skipped." => "Pokud není zaškrtnuto, bude toto nastavení přeskočeno.",
diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php
index 88006e1b5d969533d145d7f81a56c1a782cc42d5..9469146d359db8cc00cb4ca153334c9a5d53dba9 100644
--- a/apps/user_ldap/l10n/pt_BR.php
+++ b/apps/user_ldap/l10n/pt_BR.php
@@ -30,8 +30,11 @@ $TRANSLATIONS = array(
 "Password" => "Senha",
 "For anonymous access, leave DN and Password empty." => "Para acesso anônimo, deixe DN e Senha vazios.",
 "User Login Filter" => "Filtro de Login de Usuário",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define o filtro a ser aplicado, o login é feito. %%uid substitui o nome do usuário na ação de login. Exemplo: \"uid=%%uid\"",
 "User List Filter" => "Filtro de Lista de Usuário",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Define o filtro a ser aplicado, ao recuperar usuários (sem espaços reservados). Exemplo: \"objectClass=person\"",
 "Group Filter" => "Filtro de Grupo",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Define o filtro a ser aplicado, ao recuperar grupos (sem espaços reservados). Exemplo: \"objectClass=posixGroup\"",
 "Connection Settings" => "Configurações de Conexão",
 "Configuration Active" => "Configuração ativa",
 "When unchecked, this configuration will be skipped." => "Quando não marcada, esta configuração será ignorada.",
@@ -45,6 +48,7 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Não use adicionalmente para conexões LDAPS, pois falhará.",
 "Case insensitve LDAP server (Windows)" => "Servidor LDAP sensível à caixa alta (Windows)",
 "Turn off SSL certificate validation." => "Desligar validação de certificado SSL.",
+"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." => "Não recomendado, use-o somente para teste! Se a conexão só funciona com esta opção, importar o certificado SSL do servidor LDAP em seu servidor %s.",
 "Cache Time-To-Live" => "Cache Time-To-Live",
 "in seconds. A change empties the cache." => "em segundos. Uma mudança esvaziará o cache.",
 "Directory Settings" => "Configurações de Diretório",
diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index c5bb6a8a50c3f17abefdde988c2e096b29291be1..df71a71e933b5463b3b6ec70c4a162a7582b77bc 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -30,8 +30,11 @@ $TRANSLATIONS = array(
 "Password" => "Heslo",
 "For anonymous access, leave DN and Password empty." => "Pre anonymný prístup ponechajte údaje DN a Heslo prázdne.",
 "User Login Filter" => "Filter prihlásenia používateľov",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahradzuje používateľské meno v činnosti prihlásenia. Napríklad: \"uid=%%uid\"",
 "User List Filter" => "Filter zoznamov používateľov",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Definuje použitý filter, pri získavaní používateľov (bez \"placeholderov\"). Napríklad: \"objectClass=osoba\"",
 "Group Filter" => "Filter skupiny",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Definuje použitý filter, pri získavaní skupín (bez \"placeholderov\"). Napríklad: \"objectClass=posixSkupina\"",
 "Connection Settings" => "Nastavenie pripojenia",
 "Configuration Active" => "Nastavenia sú aktívne ",
 "When unchecked, this configuration will be skipped." => "Ak nie je zaškrtnuté, nastavenie bude preskočené.",
@@ -45,6 +48,7 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Nepoužívajte pre pripojenie LDAPS, zlyhá.",
 "Case insensitve LDAP server (Windows)" => "LDAP server nerozlišuje veľkosť znakov (Windows)",
 "Turn off SSL certificate validation." => "Vypnúť overovanie SSL certifikátu.",
+"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." => "Neodporúčané, použite iba pri testovaní! Pokiaľ spojenie funguje iba z daným nastavením, importujte SSL certifikát LDAP servera do vášho %s servera.",
 "Cache Time-To-Live" => "Životnosť objektov v cache",
 "in seconds. A change empties the cache." => "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť.",
 "Directory Settings" => "Nastavenie priečinka",
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index c7fb33195d74de4267a08077cd35ea18665e6648..3288438c09b94a44617d0b14ece333e530510984 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -30,8 +30,11 @@ $TRANSLATIONS = array(
 "Password" => "Lösenord",
 "For anonymous access, leave DN and Password empty." => "För anonym åtkomst, lämna DN och lösenord tomt.",
 "User Login Filter" => "Filter logga in användare",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Definierar filter som tillämpas vid inloggning. %%uid ersätter användarnamn vid inloggningen. Exempel: \"uid=%%uid\"",
 "User List Filter" => "Filter lista användare",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Definierar filter som tillämpas vid sökning efter användare (inga platshållare). Exempel: \"objectClass=person\"",
 "Group Filter" => "Gruppfilter",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Definierar filter som tillämpas vid sökning efter grupper (inga platshållare). Exempel: \"objectClass=posixGroup\"",
 "Connection Settings" => "Uppkopplingsinställningar",
 "Configuration Active" => "Konfiguration aktiv",
 "When unchecked, this configuration will be skipped." => "Ifall denna är avbockad så kommer konfigurationen att skippas.",
@@ -45,6 +48,7 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Använd inte för LDAPS-anslutningar, det kommer inte att fungera.",
 "Case insensitve LDAP server (Windows)" => "LDAP-servern är okänslig för gemener och versaler (Windows)",
 "Turn off SSL certificate validation." => "Stäng av verifiering av SSL-certifikat.",
+"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." => "Rekommenderas inte, använd endast för test! Om anslutningen bara fungerar med denna inställning behöver du importera LDAP-serverns SSL-certifikat till din %s server.",
 "Cache Time-To-Live" => "Cache Time-To-Live",
 "in seconds. A change empties the cache." => "i sekunder. En förändring tömmer cache.",
 "Directory Settings" => "Mappinställningar",
diff --git a/apps/user_ldap/l10n/zh_CN.GB2312.php b/apps/user_ldap/l10n/zh_CN.GB2312.php
deleted file mode 100644
index 306b84a588e240a87de974baacf257a24c7f6cb3..0000000000000000000000000000000000000000
--- a/apps/user_ldap/l10n/zh_CN.GB2312.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Deletion failed" => "删除失败",
-"Success" => "成功",
-"Error" => "出错",
-"Host" => "主机",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "您可以忽略协议，除非您需要 SSL。然后用 ldaps:// 开头",
-"Base DN" => "基本判别名",
-"You can specify Base DN for users and groups in the Advanced tab" => "您可以在高级选项卡中为用户和群组指定基本判别名",
-"User DN" => "用户判别名",
-"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "客户机用户的判别名，将用于绑定，例如 uid=agent, dc=example, dc=com。匿名访问请留空判别名和密码。",
-"Password" => "密码",
-"For anonymous access, leave DN and Password empty." => "匿名访问请留空判别名和密码。",
-"User Login Filter" => "用户登录过滤器",
-"User List Filter" => "用户列表过滤器",
-"Group Filter" => "群组过滤器",
-"Port" => "端口",
-"Use TLS" => "使用 TLS",
-"Case insensitve LDAP server (Windows)" => "大小写不敏感的 LDAP 服务器 (Windows)",
-"Turn off SSL certificate validation." => "关闭 SSL 证书校验。",
-"in seconds. A change empties the cache." => "以秒计。修改会清空缓存。",
-"User Display Name Field" => "用户显示名称字段",
-"Base User Tree" => "基本用户树",
-"Group Display Name Field" => "群组显示名称字段",
-"Base Group Tree" => "基本群组树",
-"Group-Member association" => "群组-成员组合",
-"in bytes" => "以字节计",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "用户名请留空 (默认)。否则，请指定一个 LDAP/AD 属性。",
-"Help" => "帮助"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/zh_TW.php b/apps/user_ldap/l10n/zh_TW.php
index 38bed895742392bdeed89aa6c8a7b2d0f2851475..2cc1ac993367209063a4944484369e1e23cec286 100644
--- a/apps/user_ldap/l10n/zh_TW.php
+++ b/apps/user_ldap/l10n/zh_TW.php
@@ -3,56 +3,59 @@ $TRANSLATIONS = array(
 "Failed to clear the mappings." => "清除映射失敗",
 "Failed to delete the server configuration" => "刪除伺服器設定時失敗",
 "The configuration is valid and the connection could be established!" => "設定有效且連線可建立",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "設定有效但連線無法建立。請檢查伺服器的設定與認證資料。",
-"The configuration is invalid. Please look in the ownCloud log for further details." => "設定無效。更多細節請參閱ownCloud的記錄檔。",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "設定有效但連線無法建立，請檢查伺服器設定與認證資料。",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "設定無效，更多細節請參閱 ownCloud 的記錄檔。",
 "Deletion failed" => "移除失敗",
-"Take over settings from recent server configuration?" => "要使用最近一次的伺服器設定嗎?",
-"Keep settings?" => "維持設定嗎?",
+"Take over settings from recent server configuration?" => "要使用最近一次的伺服器設定嗎？",
+"Keep settings?" => "維持設定嗎？",
 "Cannot add server configuration" => "無法新增伺服器設定",
 "mappings cleared" => "映射已清除",
 "Success" => "成功",
 "Error" => "錯誤",
 "Connection test succeeded" => "連線測試成功",
 "Connection test failed" => "連線測試失敗",
-"Do you really want to delete the current Server Configuration?" => "您真的確定要刪除現在的伺服器設定嗎?",
-"Confirm Deletion" => "確認已刪除",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>警告:</b>沒有安裝 PHP LDAP 模組，後端系統將無法運作。請要求您的系統管理員安裝模組。",
+"Do you really want to delete the current Server Configuration?" => "您真的要刪除現在的伺服器設定嗎？",
+"Confirm Deletion" => "確認刪除",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>警告：</b>沒有安裝 PHP LDAP 模組，後端系統將無法運作，請要求您的系統管理員安裝模組。",
 "Server configuration" => "伺服器設定",
 "Add Server Configuration" => "新增伺服器設定",
 "Host" => "主機",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "若您不需要SSL加密傳輸則可忽略通訊協定。若非如此請從ldaps://開始",
-"One Base DN per line" => "一行一個Base DN",
-"You can specify Base DN for users and groups in the Advanced tab" => "您可以在進階標籤頁裡面指定使用者及群組的Base DN",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "若您不需要 SSL 加密連線則不需輸入通訊協定，反之請輸入 ldaps://",
+"Base DN" => "Base DN",
+"One Base DN per line" => "一行一個 Base DN",
+"You can specify Base DN for users and groups in the Advanced tab" => "您可以在進階標籤頁裡面指定使用者及群組的 Base DN",
+"User DN" => "User DN",
 "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "客戶端使用者的DN與特定字詞的連結需要完善，例如:uid=agent,dc=example,dc=com。若是匿名連接，則將DN與密碼欄位留白。",
 "Password" => "密碼",
-"For anonymous access, leave DN and Password empty." => "匿名連接時請將DN與密碼欄位留白",
-"User Login Filter" => "使用者登入過濾器",
-"User List Filter" => "使用者名單篩選器",
-"Group Filter" => "群組篩選器",
+"For anonymous access, leave DN and Password empty." => "匿名連接時請將 DN 與密碼欄位留白",
+"User Login Filter" => "User Login Filter",
+"User List Filter" => "User List Filter",
+"Group Filter" => "Group Filter",
 "Connection Settings" => "連線設定",
-"Configuration Active" => "設定為主動模式",
+"Configuration Active" => "設定使用中",
 "When unchecked, this configuration will be skipped." => "沒有被勾選時，此設定會被略過。",
-"Port" => "連接阜",
+"Port" => "連接埠",
 "Backup (Replica) Host" => "備用主機",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "請給定一個可選的備用主機。必須是LDAP/AD中央伺服器的複本。",
-"Backup (Replica) Port" => "備用(複本)連接阜",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "可以選擇性設定備用主機，必須是 LDAP/AD 中央伺服器的複本。",
+"Backup (Replica) Port" => "備用（複本）連接埠",
 "Disable Main Server" => "停用主伺服器",
-"Use TLS" => "使用TLS",
-"Case insensitve LDAP server (Windows)" => "不區分大小寫的LDAP伺服器(Windows)",
-"Turn off SSL certificate validation." => "關閉 SSL 憑證驗證",
+"Use TLS" => "使用 TLS",
+"Do not use it additionally for LDAPS connections, it will fail." => "不要同時與 LDAPS 使用，會有問題。",
+"Case insensitve LDAP server (Windows)" => "不區分大小寫的 LDAP 伺服器 (Windows)",
+"Turn off SSL certificate validation." => "關閉 SSL 憑證檢查",
 "Cache Time-To-Live" => "快取的存活時間",
-"in seconds. A change empties the cache." => "以秒為單位。更變後會清空快取。",
-"Directory Settings" => "目錄選項",
-"User Display Name Field" => "使用者名稱欄位",
-"Base User Tree" => "Base使用者數",
-"One User Base DN per line" => "一行一個使用者Base DN",
-"User Search Attributes" => "使用者搜索屬性",
-"Optional; one attribute per line" => "可選的; 一行一項屬性",
+"in seconds. A change empties the cache." => "以秒為單位。變更後會清空快取。",
+"Directory Settings" => "目錄設定",
+"User Display Name Field" => "使用者顯示名稱欄位",
+"Base User Tree" => "Base User Tree",
+"One User Base DN per line" => "一行一個使用者 Base DN",
+"User Search Attributes" => "User Search Attributes",
+"Optional; one attribute per line" => "非必要，一行一項屬性",
 "Group Display Name Field" => "群組顯示名稱欄位",
-"Base Group Tree" => "Base群組樹",
-"One Group Base DN per line" => "一行一個群組Base DN",
-"Group Search Attributes" => "群組搜索屬性",
-"Group-Member association" => "群組成員的關係",
+"Base Group Tree" => "Base Group Tree",
+"One Group Base DN per line" => "一行一個 Group Base DN",
+"Group Search Attributes" => "Group Search Attributes",
+"Group-Member association" => "Group-Member association",
 "Special Attributes" => "特殊屬性",
 "Quota Field" => "配額欄位",
 "Quota Default" => "預設配額",
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 6f6b8d0f016f03c7559b21179827f229db27bff4..52aa39012fd0b2788403169ef45d4d0c658d73c0 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -991,7 +991,7 @@ abstract class Access {
 	 * internally we store them for usage in LDAP filters
 	 */
 	private function DNasBaseParameter($dn) {
-		return str_replace('\\5c', '\\', $dn);
+		return str_ireplace('\\5c', '\\', $dn);
 	}
 
 	/**
diff --git a/apps/user_webdavauth/l10n/zh_CN.php b/apps/user_webdavauth/l10n/zh_CN.php
index 69046042160cdb6cde7fd9e865d648bc613d5c9d..a225ea7f577edf1c76ee2a0e43e65c7b194b27a6 100644
--- a/apps/user_webdavauth/l10n/zh_CN.php
+++ b/apps/user_webdavauth/l10n/zh_CN.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV 认证"
+"WebDAV Authentication" => "WebDAV 认证",
+"Address: " => "地址：",
+"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." => "用户的身份将会被发送到此 URL。这个插件检查返回值并且将 HTTP 状态编码 401 和 403 解释为非法身份，其他所有返回值为合法身份。"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/config/config.sample.php b/config/config.sample.php
index 24ba541ac5c8d5f268df6b66db305a0aafc42bb4..f5cb33732f840d038f6be31206225a0d59aba4fd 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -141,10 +141,22 @@ $CONFIG = array(
 /* Loglevel to start logging at. 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default is WARN) */
 "loglevel" => "",
 
+/* date format to be used while writing to the owncloud logfile */
+'logdateformat' => 'F d, Y H:i:s',
+
 /* 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,
 
+/*
+ * 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
+ * will stay limited and older entries are available for a while longer. The
+ * total disk usage is twice the configured size.
+ * WARNING: When you use this, the log entries will eventually be lost.
+ */
+'log_rotate_size' => false, // 104857600, // 100 MiB
+
 /* Lifetime of the remember login cookie, default is 15 days */
 "remember_login_cookie_lifetime" => 60*60*24*15,
 
@@ -189,7 +201,4 @@ $CONFIG = array(
 'customclient_desktop' => '', //http://owncloud.org/sync-clients/
 'customclient_android' => '', //https://play.google.com/store/apps/details?id=com.owncloud.android
 'customclient_ios' => '', //https://itunes.apple.com/us/app/owncloud/id543672169?mt=8
-
-// date format to be used while writing to the owncloud logfile
-'logdateformat' => 'F d, Y H:i:s'
 );
diff --git a/console.php b/console.php
index 4aec5bdc24ffe1bb32ca0ddb0d9bc8f1b4499457..fbe09d9bb689078424aca6e323e00c52fcc8917b 100644
--- a/console.php
+++ b/console.php
@@ -1,3 +1,4 @@
+
 <?php
 /**
  * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
@@ -20,17 +21,32 @@ if (!OC::$CLI) {
 	exit(0);
 }
 
+$self = basename($argv[0]);
 if ($argc <= 1) {
-	echo "Usage:" . PHP_EOL;
-	echo " " . basename($argv[0]) . " <command>" . PHP_EOL;
-	exit(0);
+	$argv[1] = "help";
 }
 
 $command = $argv[1];
 array_shift($argv);
 
-if ($command === 'files:scan') {
-	require_once 'apps/files/console/scan.php';
-} else {
-	echo "Unknown command '$command'" . PHP_EOL;
+switch ($command) {
+	case 'files:scan':
+		require_once 'apps/files/console/scan.php';
+		break;
+	case 'status':
+		require_once 'status.php';
+		break;
+	case 'help':
+		echo "Usage:" . PHP_EOL;
+		echo " " . $self . " <command>" . PHP_EOL;
+		echo PHP_EOL;
+		echo "Available commands:" . PHP_EOL;
+		echo " files:scan -> rescan filesystem" .PHP_EOL;
+		echo " status -> show some status information" .PHP_EOL;
+		echo " help -> show this help screen" .PHP_EOL;
+		break;
+	default:
+		echo "Unknown command '$command'" . PHP_EOL;
+		echo "For available commands type ". $self . " help" . PHP_EOL;
+		break;
 }
diff --git a/core/ajax/share.php b/core/ajax/share.php
index bdcb61284ecdd8603a7165790c4d7420fed49d53..648f0a71bd44da7c93fbaccb88388c7db92aac99 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -181,10 +181,10 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 // 						}
 // 					}
 // 				}
+				$groups = OC_Group::getGroups($_GET['search']);
 				if ($sharePolicy == 'groups_only') {
-					$groups = OC_Group::getUserGroups(OC_User::getUser());
-				} else {
-					$groups = OC_Group::getGroups();
+					$usergroups = OC_Group::getUserGroups(OC_User::getUser());
+					$groups = array_intersect($groups, $usergroups);
 				}
 				$count = 0;
 				$users = array();
@@ -213,15 +213,18 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 					}
 				}
 				$count = 0;
+				
+				// enable l10n support
+				$l = OC_L10N::get('core');
+				
 				foreach ($groups as $group) {
 					if ($count < 15) {
-						if (stripos($group, $_GET['search']) !== false
-							&& (!isset($_GET['itemShares'])
+						if (!isset($_GET['itemShares'])
 							|| !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])
 							|| !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])
-							|| !in_array($group, $_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]))) {
+							|| !in_array($group, $_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])) {
 							$shareWith[] = array(
-								'label' => $group.' (group)',
+								'label' => $group.' ('.$l->t('group').')',
 								'value' => array(
 									'shareType' => OCP\Share::SHARE_TYPE_GROUP,
 									'shareWith' => $group
diff --git a/core/ajax/update.php b/core/ajax/update.php
index 43ed75b07f1d0aa4d2e29aedbac3887d6f47ddaa..d6af84e95b1126377a248754df903b6af5239de4 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -4,25 +4,26 @@ $RUNTIME_NOAPPS = true;
 require_once '../../lib/base.php';
 
 if (OC::checkUpgrade(false)) {
+	$l = new \OC_L10N('core');
 	$eventSource = new OC_EventSource();
 	$updater = new \OC\Updater(\OC_Log::$object);
-	$updater->listen('\OC\Updater', 'maintenanceStart', function () use ($eventSource) {
-		$eventSource->send('success', 'Turned on maintenance mode');
+	$updater->listen('\OC\Updater', 'maintenanceStart', function () use ($eventSource, $l) {
+		$eventSource->send('success', (string)$l->t('Turned on maintenance mode'));
 	});
-	$updater->listen('\OC\Updater', 'maintenanceEnd', function () use ($eventSource) {
-		$eventSource->send('success', 'Turned off maintenance mode');
+	$updater->listen('\OC\Updater', 'maintenanceEnd', function () use ($eventSource, $l) {
+		$eventSource->send('success', (string)$l->t('Turned off maintenance mode'));
 	});
-	$updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource) {
-		$eventSource->send('success', 'Updated database');
+	$updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l) {
+		$eventSource->send('success', (string)$l->t('Updated database'));
 	});
-	$updater->listen('\OC\Updater', 'filecacheStart', function () use ($eventSource) {
-		$eventSource->send('success', 'Updating filecache, this may take really long...');
+	$updater->listen('\OC\Updater', 'filecacheStart', function () use ($eventSource, $l) {
+		$eventSource->send('success', (string)$l->t('Updating filecache, this may take really long...'));
 	});
-	$updater->listen('\OC\Updater', 'filecacheDone', function () use ($eventSource) {
-		$eventSource->send('success', 'Updated filecache');
+	$updater->listen('\OC\Updater', 'filecacheDone', function () use ($eventSource, $l) {
+		$eventSource->send('success', (string)$l->t('Updated filecache'));
 	});
-	$updater->listen('\OC\Updater', 'filecacheProgress', function ($out) use ($eventSource) {
-		$eventSource->send('success', '... ' . $out . '% done ...');
+	$updater->listen('\OC\Updater', 'filecacheProgress', function ($out) use ($eventSource, $l) {
+		$eventSource->send('success', (string)$l->t('... %d%% done ...', array('percent' => $out)));
 	});
 	$updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource) {
 		$eventSource->send('failure', $message);
diff --git a/core/css/apps.css b/core/css/apps.css
new file mode 100644
index 0000000000000000000000000000000000000000..445a3b9b59fa6e0f52675f9f7c912fb020915092
--- /dev/null
+++ b/core/css/apps.css
@@ -0,0 +1,236 @@
+/* ---- APP STYLING ---- */
+
+#app {
+	height: 100%;
+	width: 100%;
+}
+#app * {
+	-moz-box-sizing: border-box; box-sizing: border-box;
+}
+
+/* Navigation: folder like structure */
+#app-navigation {
+	width: 300px;
+	height: 100%;
+	float: left;
+	-moz-box-sizing: border-box; box-sizing: border-box;
+	background-color: #f8f8f8;
+	border-right: 1px solid #ccc;
+}
+#app-navigation > ul {
+	height: 100%;
+	overflow: auto;
+	-moz-box-sizing: border-box; box-sizing: border-box;
+}
+#app-navigation li {
+	position: relative;
+	width: 100%;
+	-moz-box-sizing: border-box; box-sizing: border-box;
+	text-shadow: 0 1px 0 rgba(255,255,255,.9);
+}
+#app-navigation .active,
+#app-navigation .active a,
+#app-navigation li:hover > a {
+	background-color: #ddd;
+	text-shadow: 0 1px 0 rgba(255,255,255,.7);
+}
+
+/* special rules for first-level entries and folders */
+#app-navigation > ul > li {
+	background-color: #f8f8f8;
+}
+
+#app-navigation .with-icon a {
+	padding-left: 44px;
+	background-size: 16px 16px;
+	background-position: 14px center;
+	background-repeat: no-repeat;
+}
+
+#app-navigation li > a {
+	display: block;
+	width: 100%;
+	height: 44px;
+	padding: 12px;
+	overflow: hidden;
+	-moz-box-sizing: border-box; box-sizing: border-box;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	color: #333;
+}
+
+#app-navigation .collapse {
+	display: none; /* hide collapse button intially */
+}
+#app-navigation .collapsible > .collapse {
+	position: absolute;
+	height: 44px;
+	width: 44px;
+	margin: 0;
+	padding: 0;
+	background: none; background-image: url('../img/actions/triangle-s.svg');
+	background-size: 16px; background-repeat: no-repeat; background-position: center;
+	border: none;
+	border-radius: 0;
+	outline: none !important;
+	box-shadow: none;
+}
+#app-navigation .collapsible:hover > a {
+	background-image: none;
+}
+#app-navigation .collapsible:hover > .collapse {
+	display: block;
+}
+
+#app-navigation .collapsible .collapse {
+	-moz-transform: rotate(-90deg);
+	-webkit-transform: rotate(-90deg);
+	-ms-transform:rotate(-90deg);
+	-o-transform:rotate(-90deg);
+	transform: rotate(-90deg);
+}
+#app-navigation .collapsible.open .collapse {
+	-moz-transform: rotate(0);
+	-webkit-transform: rotate(0);
+	-ms-transform:rotate(0);
+	-o-transform:rotate(0);
+	transform: rotate(0);
+}
+
+/* Second level nesting for lists */
+#app-navigation > ul ul {
+	display: none;
+}
+#app-navigation > ul ul li > a {
+	padding-left: 32px;
+}
+#app-navigation > .with-icon ul li > a {
+	padding-left: 48px;
+	background-position: 24px center;
+}
+
+#app-navigation .open {
+	background-image: linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+	background-image: -o-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+	background-image: -moz-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+	background-image: -webkit-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+	background-image: -ms-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+}
+
+#app-navigation > ul .open:hover {
+	-moz-box-shadow: inset 0 0 3px #ccc; -webkit-box-shadow: inset 0 0 3px #ccc; box-shadow: inset 0 0 3px #ccc;
+}
+
+#app-navigation > ul .open ul {
+	display: block;
+}
+
+
+/* counter and actions */
+#app-navigation .utils {
+	position: absolute;
+	right: 0;
+	top: 0;
+	bottom: 0;
+	font-size: 12px;
+}
+	#app-navigation .utils button,
+	#app-navigation .utils .counter {
+		width: 44px;
+		height: 44px;
+		padding-top: 12px;
+	}
+
+
+/* drag and drop */
+#app-navigation .drag-and-drop {
+	-moz-transition: padding-bottom 500ms ease 0s;
+	-o-transition: padding-bottom 500ms ease 0s;
+	-webkit-transition: padding-bottom 500ms ease 0s;
+	-ms-transition: padding-bottom 500ms ease 0s;
+	transition: padding-bottom 500ms ease 0s;
+	padding-bottom: 40px;
+}
+#app-navigation .personalblock > legend { /* TODO @Raydiation: still needed? */
+	padding: 10px 0; margin: 0;
+}
+#app-navigation .error {
+	color: #dd1144;
+}
+
+#app-navigation .app-navigation-separator {
+	border-bottom: 1px solid #ddd;
+}
+
+
+
+/* Part where the content will be loaded into */
+#app-content {
+	height: 100%;
+	overflow-y: auto;
+}
+
+/* settings area */
+#app-settings {
+	position: fixed;
+	width: 299px;
+	bottom: 0;
+	border-top: 1px solid #ccc;
+}
+#app-settings-header {
+	background-color: #eee;
+}
+#app-settings-content {
+	display: none;
+	padding: 10px;
+	background-color: #eee;
+}
+#app-settings.open #app-settings-content {
+	display: block;
+}
+
+.settings-button {
+	display: block;
+	height: 32px;
+	width: 100%;
+	padding: 0;
+	margin: 0;
+	background-color: transparent; background-image: url('../img/actions/settings.svg');
+	background-position: 10px center; background-repeat: no-repeat;
+	box-shadow: none;
+	border: 0;
+	border-radius: 0;
+}
+.settings-button:hover {
+	background-color: #ddd;
+}
+
+/* icons */
+.folder-icon, .delete-icon, .edit-icon, .progress-icon {
+	background-repeat: no-repeat;
+	background-position: center;
+}
+.folder-icon { background-image: url('../img/places/folder.svg'); }
+.delete-icon { background-image: url('../img/actions/delete.svg'); }
+.delete-icon:hover, .delete-icon:focus {
+	background-image: url('../img/actions/delete-hover.svg');
+}
+.edit-icon { background-image: url('../img/actions/rename.svg'); }
+.progress-icon {
+	background-image: url('../img/loading.gif');
+	background-size: 16px;
+	/* force show the loading icon, not only on hover */
+	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+	filter:alpha(opacity=100);
+	opacity: 1 !important;
+	display: inline !important;
+}
+
+/* buttons */
+button.loading {
+	background-image: url('../img/loading.gif');
+	background-position: right 10px center; background-repeat: no-repeat;
+	background-size: 16px;
+	padding-right: 30px;
+}
+
diff --git a/core/css/fixes.css b/core/css/fixes.css
new file mode 100644
index 0000000000000000000000000000000000000000..3df60ad5b5c7099f9154bacbeefc22ef03ab8cac
--- /dev/null
+++ b/core/css/fixes.css
@@ -0,0 +1,46 @@
+/* ---- BROWSER-SPECIFIC FIXES ---- */
+
+/* remove dotted outlines in Firefox */
+::-moz-focus-inner {
+	border: 0;
+}
+
+.lte8 .delete-icon { background-image: url('../img/actions/delete.png'); }
+.lte8 .delete-icon:hover, .delete-icon:focus {
+	background-image: url('../img/actions/delete-hover.png');
+}
+
+/* IE8 needs background to be set to same color to make transparency look good. */
+.lte9 #body-login form input[type="text"] {
+	border: 1px solid lightgrey; /* use border to add 1px line between input fields */
+	background-color: white; /* don't change background on hover */
+}
+.lte9 #body-login form input[type="password"] {
+	/* leave out top border for 1px line between input fields*/
+	border-left: 1px solid lightgrey;
+	border-right: 1px solid lightgrey;
+	border-bottom: 1px solid lightgrey;
+	background-color: white; /* don't change background on hover */
+}
+.lte9 #body-login form label.infield {
+	background-color: white; /* don't change background on hover */
+	-ms-filter: "progid:DXImageTransform.Microsoft.Chroma(color='white')";
+}
+
+/* disable opacity of info text on gradient
+   since we cannot set a good backround color to use the filter&background hack as with the input labels */
+.lte9 #body-login p.info {
+	filter: initial;
+}
+
+/* deactivate show password toggle for IE. Does not work for 8 and 9+ have their own implementation. */
+.ie #show, .ie #show+label {
+	display: none;
+	visibility: hidden;
+}
+
+/* fix installation screen rendering issue for IE8+9 */
+.lte9 #body-login {
+	height: auto !important;
+}
+
diff --git a/core/css/styles.css b/core/css/styles.css
index dee0778afbb3edeeed1d5e4881fec299ea0c35d3..34e8e8ae416e6db05ee6a4c6f7c82f986af23872 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -255,9 +255,9 @@ input[name="adminpass-clone"] { padding-left:1.8em; width:11.7em !important; }
 #body-login input[type="password"],
 #body-login input[type="email"] {
 	border: 1px solid #323233;
-	-moz-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset;
-	-webkit-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset;
-	box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset;
+	-moz-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset;
+	-webkit-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset;
+	box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset;
 }
 
 /* Nicely grouping input field sets */
@@ -501,6 +501,9 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 #navigation:hover {
 	overflow-y: auto; /* show scrollbar only on hover */
 }
+#apps {
+	height: 100%;
+}
 #navigation a span {
 	display: block;
 	text-decoration: none;
@@ -545,9 +548,24 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 		padding-top: 20px;
 	}
 
+/* Apps management as sticky footer, less obtrusive in the list */
+#navigation .wrapper {
+	min-height: 100%;
+	margin: 0 auto -72px;
+}
+#apps-management, #navigation .push {
+	height: 70px;
+}
 #apps-management {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
+	filter: alpha(opacity=60);
 	opacity: .6;
 }
+#apps-management .icon {
+	padding-bottom: 0;
+}
+
+
 
 
 /* USER MENU */
@@ -709,286 +727,3 @@ div.crumb:active {
 	opacity:.7;
 }
 
-
-
-/* ---- APP STYLING ---- */
-#app {
-	height: 100%;
-	width: 100%;
-}
-#app * {
-	-moz-box-sizing: border-box; box-sizing: border-box;
-}
-
-/* Navigation: folder like structure */
-#app-navigation {
-	width: 300px;
-	height: 100%;
-	float: left;
-	-moz-box-sizing: border-box; box-sizing: border-box;
-	background-color: #f8f8f8;
-	border-right: 1px solid #ccc;
-}
-#app-navigation > ul {
-	height: 100%;
-	overflow: auto;
-	-moz-box-sizing: border-box; box-sizing: border-box;
-}
-#app-navigation li {
-	position: relative;
-	width: 100%;
-	-moz-box-sizing: border-box; box-sizing: border-box;
-	text-shadow: 0 1px 0 rgba(255,255,255,.9);
-}
-#app-navigation .active,
-#app-navigation .active a,
-#app-navigation li:hover > a {
-	background-color: #ddd;
-	text-shadow: 0 1px 0 rgba(255,255,255,.7);
-}
-
-/* special rules for first-level entries and folders */
-#app-navigation > ul > li {
-	background-color: #f8f8f8;
-}
-
-#app-navigation .with-icon a {
-	padding-left: 44px;
-	background-size: 16px 16px;
-	background-position: 14px center;
-	background-repeat: no-repeat;
-}
-
-#app-navigation li > a {
-	display: block;
-	width: 100%;
-	height: 44px;
-	padding: 12px;
-	overflow: hidden;
-	-moz-box-sizing: border-box; box-sizing: border-box;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	color: #333;
-}
-
-#app-navigation .collapse {
-	display: none; /* hide collapse button intially */
-}
-#app-navigation .collapsible > .collapse {
-	position: absolute;
-	height: 44px;
-	width: 44px;
-	margin: 0;
-	padding: 0;
-	background: none; background-image: url('../img/actions/triangle-s.svg');
-	background-size: 16px; background-repeat: no-repeat; background-position: center;
-	border: none;
-	border-radius: 0;
-	outline: none !important;
-	box-shadow: none;
-}
-#app-navigation .collapsible:hover > a {
-	background-image: none;
-}
-#app-navigation .collapsible:hover > .collapse {
-	display: block;
-}
-
-#app-navigation .collapsible .collapse {
-	-moz-transform: rotate(-90deg);
-	-webkit-transform: rotate(-90deg);
-	-ms-transform:rotate(-90deg);
-	-o-transform:rotate(-90deg);
-	transform: rotate(-90deg);
-}
-#app-navigation .collapsible.open .collapse {
-	-moz-transform: rotate(0);
-	-webkit-transform: rotate(0);
-	-ms-transform:rotate(0);
-	-o-transform:rotate(0);
-	transform: rotate(0);
-}
-
-/* Second level nesting for lists */
-#app-navigation > ul ul {
-	display: none;
-}
-#app-navigation > ul ul li > a {
-	padding-left: 32px;
-}
-#app-navigation > .with-icon ul li > a {
-	padding-left: 48px;
-	background-position: 24px center;
-}
-
-#app-navigation .open {
-	background-image: linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
-	background-image: -o-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
-	background-image: -moz-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
-	background-image: -webkit-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
-	background-image: -ms-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
-}
-
-#app-navigation > ul .open:hover {
-	-moz-box-shadow: inset 0 0 3px #ccc; -webkit-box-shadow: inset 0 0 3px #ccc; box-shadow: inset 0 0 3px #ccc;
-}
-
-#app-navigation > ul .open ul {
-	display: block;
-}
-
-
-/* counter and actions */
-#app-navigation .utils {
-	position: absolute;
-	right: 0;
-	top: 0;
-	bottom: 0;
-	font-size: 12px;
-}
-	#app-navigation .utils button,
-	#app-navigation .utils .counter {
-		width: 44px;
-		height: 44px;
-		padding-top: 12px;
-	}
-
-
-/* drag and drop */
-#app-navigation .drag-and-drop {
-	-moz-transition: padding-bottom 500ms ease 0s;
-	-o-transition: padding-bottom 500ms ease 0s;
-	-webkit-transition: padding-bottom 500ms ease 0s;
-	-ms-transition: padding-bottom 500ms ease 0s;
-	transition: padding-bottom 500ms ease 0s;
-	padding-bottom: 40px;
-}
-#app-navigation .personalblock > legend { /* TODO @Raydiation: still needed? */
-	padding: 10px 0; margin: 0;
-}
-#app-navigation .error {
-	color: #dd1144;
-}
-
-#app-navigation .app-navigation-separator {
-	border-bottom: 1px solid #ddd;
-}
-
-
-
-/* Part where the content will be loaded into */
-#app-content {
-	height: 100%;
-	overflow-y: auto;
-}
-
-/* settings area */
-#app-settings {
-	position: fixed;
-	width: 299px;
-	bottom: 0;
-	border-top: 1px solid #ccc;
-}
-#app-settings-header {
-	background-color: #eee;
-}
-#app-settings-content {
-	display: none;
-	padding: 10px;
-	background-color: #eee;
-}
-#app-settings.open #app-settings-content {
-	display: block;
-}
-
-.settings-button {
-	display: block;
-	height: 32px;
-	width: 100%;
-	padding: 0;
-	margin: 0;
-	background-color: transparent; background-image: url('../img/actions/settings.svg');
-	background-position: 10px center; background-repeat: no-repeat;
-	box-shadow: none;
-	border: 0;
-	border-radius: 0;
-}
-.settings-button:hover {
-	background-color: #ddd;
-}
-
-/* icons */
-.folder-icon, .delete-icon, .edit-icon, .progress-icon {
-	background-repeat: no-repeat;
-	background-position: center;
-}
-.folder-icon { background-image: url('../img/places/folder.svg'); }
-.delete-icon { background-image: url('../img/actions/delete.svg'); }
-.delete-icon:hover, .delete-icon:focus {
-	background-image: url('../img/actions/delete-hover.svg');
-}
-.edit-icon { background-image: url('../img/actions/rename.svg'); }
-.progress-icon {
-	background-image: url('../img/loading.gif');
-	background-size: 16px;
-	/* force show the loading icon, not only on hover */
-	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-	filter:alpha(opacity=100);
-	opacity: 1 !important;
-	display: inline !important;
-}
-
-/* buttons */
-button.loading {
-	background-image: url('../img/loading.gif');
-	background-position: right 10px center; background-repeat: no-repeat;
-	background-size: 16px;
-	padding-right: 30px;
-}
-
-
-
-
-
-/* ---- BROWSER-SPECIFIC FIXES ---- */
-
-/* remove dotted outlines in Firefox */
-::-moz-focus-inner {
-	border: 0;
-}
-.lte8 .delete-icon { background-image: url('../img/actions/delete.png'); }
-.lte8 .delete-icon:hover, .delete-icon:focus {
-	background-image: url('../img/actions/delete-hover.png');
-}
-
-/* IE8 needs background to be set to same color to make transparency look good. */
-.lte9 #body-login form input[type="text"] {
-	border: 1px solid lightgrey; /* use border to add 1px line between input fields */
-	background-color: white; /* don't change background on hover */
-}
-.lte9 #body-login form input[type="password"] {
-	/* leave out top border for 1px line between input fields*/
-	border-left: 1px solid lightgrey;
-	border-right: 1px solid lightgrey;
-	border-bottom: 1px solid lightgrey;
-	background-color: white; /* don't change background on hover */
-}
-.lte9 #body-login form label.infield {
-	background-color: white; /* don't change background on hover */
-	-ms-filter: "progid:DXImageTransform.Microsoft.Chroma(color='white')";
-}
-/* disable opacity of info text on gradient
-   sice we cannot set a good backround color to use the filter&background hack as with the input labels */
-.lte9 #body-login p.info {
-	filter: initial;
-}
-/* deactivate show password toggle for IE. Does not work for 8 and 9+ have their own implementation. */
-.ie #show, .ie #show+label {
-	display: none;
-	visibility: hidden;
-}
-
-/* fix installation screen rendering issue for IE8+9 */
-.lte9 #body-login {
-	height: auto !important;
-}
diff --git a/core/js/js.js b/core/js/js.js
index d580b6113e6eb667e1012bc598a596954155cc81..af4a6d6b336ca3e34a36aba8d4675ebf32ea3c71 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -709,7 +709,6 @@ $(document).ready(function(){
 		});
 		label.hide();
 	};
-	setShowPassword($('#password'), $('label[for=show]'));
 	setShowPassword($('#adminpass'), $('label[for=show]'));
 	setShowPassword($('#pass2'), $('label[for=personal-show]'));
 	setShowPassword($('#dbpass'), $('label[for=dbpassword]'));
@@ -762,6 +761,7 @@ $(document).ready(function(){
 	$('.password .action').tipsy({gravity:'se', fade:true, live:true});
 	$('#upload').tipsy({gravity:'w', fade:true});
 	$('.selectedActions a').tipsy({gravity:'s', fade:true, live:true});
+	$('a.action.delete').tipsy({gravity:'e', fade:true, live:true});
 	$('a.action').tipsy({gravity:'s', fade:true, live:true});
 	$('td .modified').tipsy({gravity:'s', fade:true, live:true});
 
diff --git a/core/js/octemplate.js b/core/js/octemplate.js
index e69c6cc56e066fed3a03c3054fdfa040da2300c0..46ffa9765741e25b2d86f31728a74db3ac6e1784 100644
--- a/core/js/octemplate.js
+++ b/core/js/octemplate.js
@@ -60,9 +60,10 @@
 			var self = this;
 
 			if(typeof this.options.escapeFunction === 'function') {
-				for (var key = 0; key < this.vars.length; key++) {
-					if(typeof this.vars[key] === 'string') {
-						this.vars[key] = self.options.escapeFunction(this.vars[key]);
+				var keys = Object.keys(this.vars);
+				for (var key = 0; key < keys.length; key++) {
+					if(typeof this.vars[keys[key]] === 'string') {
+						this.vars[keys[key]] = self.options.escapeFunction(this.vars[keys[key]]);
 					}
 				}
 			}
@@ -85,7 +86,7 @@
 			}
 		},
 		options: {
-			escapeFunction: function(str) {return $('<i></i>').text(str).html();}
+			escapeFunction: escapeHTML
 		}
 	};
 
diff --git a/core/js/placeholder.js b/core/js/placeholder.js
new file mode 100644
index 0000000000000000000000000000000000000000..16543541cb4854d1236404f34a66f17d53ead2be
--- /dev/null
+++ b/core/js/placeholder.js
@@ -0,0 +1,65 @@
+/**
+ * ownCloud
+ *
+ * @author Morris Jobke
+ * @copyright 2013 Morris Jobke <morris.jobke@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/*
+ * Adds a background color to the element called on and adds the first character
+ * of the passed in string. This string is also the seed for the generation of
+ * the background color.
+ *
+ * You have following HTML:
+ *
+ * <div id="albumart"></div>
+ *
+ * And call this from Javascript:
+ *
+ * $('#albumart').placeholder('The Album Title');
+ *
+ * Which will result in:
+ *
+ * <div id="albumart" style="background-color: rgb(123, 123, 123); ... ">T</div>
+ *
+ */
+
+(function ($) {
+	$.fn.placeholder = function(seed) {
+		var hash = md5(seed),
+			maxRange = parseInt('ffffffffff', 16),
+			red = parseInt(hash.substr(0,10), 16) / maxRange * 256,
+			green = parseInt(hash.substr(10,10), 16) / maxRange * 256,
+			blue = parseInt(hash.substr(20,10), 16) / maxRange * 256,
+			rgb = [Math.floor(red), Math.floor(green), Math.floor(blue)],
+			height = this.height();
+		this.css('background-color', 'rgb(' + rgb.join(',') + ')');
+
+		// CSS rules
+		this.css('color', 'rgb(255, 255, 255)');
+		this.css('font-weight', 'bold');
+		this.css('text-align', 'center');
+
+		// calculate the height
+		this.css('line-height', height + 'px');
+		this.css('font-size', (height * 0.55) + 'px');
+
+		if(seed !== null && seed.length) {
+			this.html(seed[0].toUpperCase());
+		}
+	};
+}(jQuery));
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index abff5bbbdb4b4db9889d26457e568dc93ad03cf9..c389ad01883a25e38ae942f7b60e5b3cda7a575e 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -126,7 +126,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Acaba la configuració",
 "%s is available. Get more information on how to update." => "%s està disponible. Obtingueu més informació de com actualitzar.",
 "Log out" => "Surt",
-"More apps" => "Més aplicacions",
 "Automatic logon rejected!" => "L'ha rebutjat l'acceditació automàtica!",
 "If you did not change your password recently, your account may be compromised!" => "Se no heu canviat la contrasenya recentment el vostre compte pot estar compromès!",
 "Please change your password to secure your account again." => "Canvieu la contrasenya de nou per assegurar el vostre compte.",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 78614eef0e7f721ab140ca9839019d36887af45d..d104a9fbe8063e5bd071f91b714baae5ab331c86 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -1,6 +1,12 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s s vámi sdílí »%s«",
+"Turned on maintenance mode" => "Zapnut režim údržby",
+"Turned off maintenance mode" => "Vypnut režim údržby",
+"Updated database" => "Zaktualizována databáze",
+"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",
@@ -126,7 +132,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Dokončit nastavení",
 "%s is available. Get more information on how to update." => "%s je dostupná. Získejte více informací k postupu aktualizace.",
 "Log out" => "Odhlásit se",
-"More apps" => "Více aplikací",
 "Automatic logon rejected!" => "Automatické přihlášení odmítnuto!",
 "If you did not change your password recently, your account may be compromised!" => "Pokud jste v nedávné době neměnili své heslo, Váš účet může být kompromitován!",
 "Please change your password to secure your account again." => "Změňte, prosím, své heslo pro opětovné zabezpečení Vašeho účtu.",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 79ccc20d495065a5cbe6f2ac943796512d23a4dd..5a1fe65f441e0b329aeee59f6f44f4eb657d22bb 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -1,6 +1,12 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s delte »%s« med sig",
+"Turned on maintenance mode" => "Startede vedligeholdelsestilstand",
+"Turned off maintenance mode" => "standsede vedligeholdelsestilstand",
+"Updated database" => "Opdaterede database",
+"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",
@@ -126,7 +132,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Afslut opsætning",
 "%s is available. Get more information on how to update." => "%s er tilgængelig. Få mere information om, hvordan du opdaterer.",
 "Log out" => "Log ud",
-"More apps" => "Flere programmer",
 "Automatic logon rejected!" => "Automatisk login afvist!",
 "If you did not change your password recently, your account may be compromised!" => "Hvis du ikke har ændret din adgangskode for nylig, har nogen muligvis tiltvunget sig adgang til din konto!",
 "Please change your password to secure your account again." => "Skift adgangskode for at sikre din konto igen.",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 2fe2f56412417b0633d90f3068765d0280fd2c9f..655305488f378b7bbeb9c10fc67cff252961840d 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -1,6 +1,12 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s teilte »%s« mit Ihnen",
+"Turned on maintenance mode" => "Wartungsmodus eingeschaltet",
+"Turned off maintenance mode" => "Wartungsmodus ausgeschaltet",
+"Updated database" => "Datenbank aktualisiert",
+"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.",
@@ -126,7 +132,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Installation abschließen",
 "%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
 "Log out" => "Abmelden",
-"More apps" => "Mehr Apps",
 "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.",
diff --git a/core/l10n/de_AT.php b/core/l10n/de_AT.php
index c0e3e80f0a37ef6db75c77020cf3093f392768b9..93c8e33f3e2d95d19676fafd4be3416cee37855d 100644
--- a/core/l10n/de_AT.php
+++ b/core/l10n/de_AT.php
@@ -3,7 +3,6 @@ $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("",""),
-"More apps" => "Mehr Apps"
+"_%n month ago_::_%n months ago_" => array("","")
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php
index 3e622ace6f66ec2c11a5871848907b71fea5fa0e..2dde9eb5367b5c31750416686407d90b40055f7c 100644
--- a/core/l10n/de_CH.php
+++ b/core/l10n/de_CH.php
@@ -30,13 +30,13 @@ $TRANSLATIONS = array(
 "December" => "Dezember",
 "Settings" => "Einstellungen",
 "seconds ago" => "Gerade eben",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("Vor %n Minute","Vor %n Minuten"),
+"_%n hour ago_::_%n hours ago_" => array("Vor %n Stunde","Vor %n Stunden"),
 "today" => "Heute",
 "yesterday" => "Gestern",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("Vor %n Tag","Vor %n Tagen"),
 "last month" => "Letzten Monat",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
 "months ago" => "Vor Monaten",
 "last year" => "Letztes Jahr",
 "years ago" => "Vor Jahren",
@@ -83,6 +83,7 @@ $TRANSLATIONS = array(
 "Email sent" => "Email gesendet",
 "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",
 "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse gesendet worde.<br>Wenn Sie ihn nicht innerhalb einer vernünftigen Zeitspanne erhalten, prüfen Sie bitte Ihre Spam-Verzeichnisse.<br>Wenn er nicht dort ist, fragen Sie Ihren lokalen Administrator.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adresse/Nutzername korrekt waren?",
@@ -125,7 +126,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Installation abschliessen",
 "%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
 "Log out" => "Abmelden",
-"More apps" => "Mehr Apps",
 "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.",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 60f5418727a5ec22acdedee4651497a4c1190f77..1311a76d693dc111d436bd3f64aa16035e7074d1 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -1,6 +1,12 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s geteilt »%s« mit Ihnen",
+"Turned on maintenance mode" => "Wartungsmodus eingeschaltet ",
+"Turned off maintenance mode" => "Wartungsmodus ausgeschaltet",
+"Updated database" => "Datenbank aktualisiert",
+"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",
@@ -126,7 +132,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Installation abschließen",
 "%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
 "Log out" => "Abmelden",
-"More apps" => "Mehr Apps",
 "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.",
diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..3a42872366af55fa32e9c198de365be3f9be68ad
--- /dev/null
+++ b/core/l10n/en_GB.php
@@ -0,0 +1,146 @@
+<?php
+$TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s shared \"%s\" with you",
+"group" => "group",
+"Turned on maintenance mode" => "Turned on maintenance mode",
+"Turned off maintenance mode" => "Turned off maintenance mode",
+"Updated database" => "Updated database",
+"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.",
+"Sunday" => "Sunday",
+"Monday" => "Monday",
+"Tuesday" => "Tuesday",
+"Wednesday" => "Wednesday",
+"Thursday" => "Thursday",
+"Friday" => "Friday",
+"Saturday" => "Saturday",
+"January" => "January",
+"February" => "February",
+"March" => "March",
+"April" => "April",
+"May" => "May",
+"June" => "June",
+"July" => "July",
+"August" => "August",
+"September" => "September",
+"October" => "October",
+"November" => "November",
+"December" => "December",
+"Settings" => "Settings",
+"seconds ago" => "seconds ago",
+"_%n minute ago_::_%n minutes ago_" => array("%n minute ago","%n minutes ago"),
+"_%n hour ago_::_%n hours ago_" => array("%n hour ago","%n hours ago"),
+"today" => "today",
+"yesterday" => "yesterday",
+"_%n day ago_::_%n days ago_" => array("%n day ago","%n days ago"),
+"last month" => "last month",
+"_%n month ago_::_%n months ago_" => array("%n month ago","%n months ago"),
+"months ago" => "months ago",
+"last year" => "last year",
+"years ago" => "years ago",
+"Choose" => "Choose",
+"Error loading file picker template" => "Error loading file picker template",
+"Yes" => "Yes",
+"No" => "No",
+"Ok" => "OK",
+"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 while sharing" => "Error whilst sharing",
+"Error while unsharing" => "Error whilst unsharing",
+"Error while changing permissions" => "Error whilst changing permissions",
+"Shared with you and the group {group} by {owner}" => "Shared with you and the group {group} by {owner}",
+"Shared with you by {owner}" => "Shared with you by {owner}",
+"Share with" => "Share with",
+"Share with link" => "Share with link",
+"Password protect" => "Password protect",
+"Password" => "Password",
+"Allow Public Upload" => "Allow Public Upload",
+"Email link to person" => "Email link to person",
+"Send" => "Send",
+"Set expiration date" => "Set expiration date",
+"Expiration date" => "Expiration date",
+"Share via email:" => "Share via email:",
+"No people found" => "No people found",
+"Resharing is not allowed" => "Resharing is not allowed",
+"Shared in {item} with {user}" => "Shared in {item} with {user}",
+"Unshare" => "Unshare",
+"can edit" => "can edit",
+"access control" => "access control",
+"create" => "create",
+"update" => "update",
+"delete" => "delete",
+"share" => "share",
+"Password protected" => "Password protected",
+"Error unsetting expiration date" => "Error unsetting expiration date",
+"Error setting expiration date" => "Error setting expiration date",
+"Sending ..." => "Sending ...",
+"Email sent" => "Email sent",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "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",
+"Use the following link to reset your password: {link}" => "Use the following link to reset your password: {link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "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 .",
+"Request failed!<br>Did you make sure your email/username was right?" => "Request failed!<br>Did you make sure your email/username was correct?",
+"You will receive a link to reset your password via Email." => "You will receive a link to reset your password via Email.",
+"Username" => "Username",
+"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?" => "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?",
+"Yes, I really want to reset my password now" => "Yes, I really want to reset my password now",
+"Request reset" => "Request reset",
+"Your password was reset" => "Your password was reset",
+"To login page" => "To login page",
+"New password" => "New password",
+"Reset password" => "Reset password",
+"Personal" => "Personal",
+"Users" => "Users",
+"Apps" => "Apps",
+"Admin" => "Admin",
+"Help" => "Help",
+"Access forbidden" => "Access denied",
+"Cloud not found" => "Cloud not found",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!",
+"Edit categories" => "Edit categories",
+"Add" => "Add",
+"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.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "No secure random number generator is available, please enable the PHP OpenSSL extension.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>.",
+"Create an <strong>admin account</strong>" => "Create an <strong>admin account</strong>",
+"Advanced" => "Advanced",
+"Data folder" => "Data folder",
+"Configure the database" => "Configure the database",
+"will be used" => "will be used",
+"Database user" => "Database user",
+"Database password" => "Database password",
+"Database name" => "Database name",
+"Database tablespace" => "Database tablespace",
+"Database host" => "Database host",
+"Finish setup" => "Finish setup",
+"%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.",
+"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>Cheers!" => "Hey there,<br><br>just letting you know that %s shared \"%s\" with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!",
+"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/et_EE.php b/core/l10n/et_EE.php
index a13ed03222117347f53a8e8865a5b367a352db23..d9d007819d3ab06704d7d989c76f4369202428b6 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -1,6 +1,12 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s jagas sinuga »%s«",
+"Turned on maintenance mode" => "Haldusreziimis",
+"Turned off maintenance mode" => "Haldusreziim lõpetatud",
+"Updated database" => "Uuendatud andmebaas",
+"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",
@@ -126,7 +132,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Lõpeta seadistamine",
 "%s is available. Get more information on how to update." => "%s on saadaval. Vaata lähemalt kuidas uuendada.",
 "Log out" => "Logi välja",
-"More apps" => "Rohkem rakendusi",
 "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.",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 83b8fca1eabd93da410dcfb471ab3050f9fde8a6..ae241e93873dbe927081ab8967b4930df87e33f9 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -126,7 +126,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Bukatu konfigurazioa",
 "%s is available. Get more information on how to update." => "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu.",
 "Log out" => "Saioa bukatu",
-"More apps" => "App gehiago",
 "Automatic logon rejected!" => "Saio hasiera automatikoa ez onartuta!",
 "If you did not change your password recently, your account may be compromised!" => "Zure pasahitza orain dela gutxi ez baduzu aldatu, zure kontua arriskuan egon daiteke!",
 "Please change your password to secure your account again." => "Mesedez aldatu zure pasahitza zure kontua berriz segurtatzeko.",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index d3cfe01293e1e0fe0256a4332b414233f7f00d4f..7efeaa1fac2ba72c1baf800ebedc069bbb9d62a9 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -1,6 +1,12 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s jakoi kohteen »%s« kanssasi",
+"Turned on maintenance mode" => "Siirrytty ylläpitotilaan",
+"Turned off maintenance mode" => "Ylläpitotila laitettu pois päältä",
+"Updated database" => "Tietokanta ajan tasalla",
+"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",
@@ -64,6 +70,7 @@ $TRANSLATIONS = array(
 "Share via email:" => "Jaa sähköpostilla:",
 "No people found" => "Henkilöitä ei löytynyt",
 "Resharing is not allowed" => "Jakaminen uudelleen ei ole salittu",
+"Shared in {item} with {user}" => "{item} on jaettu {user} kanssa",
 "Unshare" => "Peru jakaminen",
 "can edit" => "voi muokata",
 "access control" => "Pääsyn hallinta",
@@ -78,6 +85,7 @@ $TRANSLATIONS = array(
 "Email sent" => "Sähköposti lähetetty",
 "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",
 "Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Linkki salasanan nollaamiseen on lähetetty sähköpostiisi.<br>Jos et saa viestiä pian, tarkista roskapostikansiosi.<br>Jos et löydä viestiä roskapostinkaan seasta, ota yhteys ylläpitäjään.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Pyyntö epäonnistui!<br>Olihan sähköpostiosoitteesi/käyttäjätunnuksesi oikein?",
@@ -118,7 +126,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Viimeistele asennus",
 "%s is available. Get more information on how to update." => "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan.",
 "Log out" => "Kirjaudu ulos",
-"More apps" => "Lisää sovelluksia",
 "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.",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 9db68bbbd059ea34b4efc032f5bf32baebaa2a90..56027e4cf1afc9da428ae3c57898726af4400452 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -1,6 +1,12 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s compartiu «%s» con vostede",
+"Turned on maintenance mode" => "Modo de mantemento activado",
+"Turned off maintenance mode" => "Modo de mantemento desactivado",
+"Updated database" => "Base de datos actualizada",
+"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",
@@ -126,7 +132,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Rematar a configuración",
 "%s is available. Get more information on how to update." => "%s está dispoñíbel. Obteña máis información sobre como actualizar.",
 "Log out" => "Desconectar",
-"More apps" => "Máis aplicativos",
 "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.",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index c9c6e1f750758c2ec0dfbdf6d1729f6b47bb6c39..b197a67b116768d0794dd1adef7f0fe4a36839a1 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -122,7 +122,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "סיום התקנה",
 "%s is available. Get more information on how to update." => "%s זמינה להורדה. ניתן ללחוץ כדי לקבל מידע נוסף כיצד לעדכן.",
 "Log out" => "התנתקות",
-"More apps" => "יישומים נוספים",
 "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." => "נא לשנות את הססמה שלך כדי לאבטח את חשבונך מחדש.",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 8c09b4e90fb0705af2e0fbc3324aadb15bbdef67..63a7545d8911103bb75923c47663bc5be9768475 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -1,6 +1,12 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s ha condiviso «%s» con te",
+"Turned on maintenance mode" => "Modalità di manutenzione attivata",
+"Turned off maintenance mode" => "Modalità di manutenzione disattivata",
+"Updated database" => "Database aggiornato",
+"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",
@@ -126,7 +132,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Termina la configurazione",
 "%s is available. Get more information on how to update." => "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento.",
 "Log out" => "Esci",
-"More apps" => "Altre applicazioni",
 "Automatic logon rejected!" => "Accesso automatico rifiutato.",
 "If you did not change your password recently, your account may be compromised!" => "Se non hai cambiato la password recentemente, il tuo account potrebbe essere compromesso.",
 "Please change your password to secure your account again." => "Cambia la password per rendere nuovamente sicuro il tuo account.",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 31d2f92eff245f267b29181d7d0c5be95ee66149..2ab85f13d3094e3c7812ce01a21dcd2ad56cccd1 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -126,7 +126,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "セットアップを完了します",
 "%s is available. Get more information on how to update." => "%s が利用可能です。更新方法に関してさらに情報を取得して下さい。",
 "Log out" => "ログアウト",
-"More apps" => "他のアプリ",
 "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." => "アカウント保護の為、パスワードを再度の変更をお願いいたします。",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 4c2d33e301071df96875c96a931502737529040b..c4b6b9f091bcbeaa68966534c0e9bc28ea4860be 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -29,13 +29,13 @@ $TRANSLATIONS = array(
 "December" => "12ì›”",
 "Settings" => "설정",
 "seconds ago" => "ì´ˆ ì „",
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n minute ago_::_%n minutes ago_" => array("%n분 전 "),
+"_%n hour ago_::_%n hours ago_" => array("%n시간 전 "),
 "today" => "오늘",
 "yesterday" => "어제",
-"_%n day ago_::_%n days ago_" => array(""),
+"_%n day ago_::_%n days ago_" => array("%n일 전 "),
 "last month" => "지난 달",
-"_%n month ago_::_%n months ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("%n달 전 "),
 "months ago" => "개월 전",
 "last year" => "ìž‘ë…„",
 "years ago" => "ë…„ ì „",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 00e47488531acf8a8a6b6b5026d669c37dadc15a..5db8f6c21a91b96ec79d7432201df9e62615b239 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s pasidalino »%s« su tavimi",
 "Category type not provided." => "Kategorija nenurodyta.",
 "No category to add?" => "NepridÄ—site jokios kategorijos?",
 "This category already exists: %s" => "Å i kategorija jau egzistuoja: %s",
@@ -29,13 +30,13 @@ $TRANSLATIONS = array(
 "December" => "Gruodis",
 "Settings" => "Nustatymai",
 "seconds ago" => "prieš sekundę",
-"_%n minute ago_::_%n minutes ago_" => array("","",""),
-"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n minute ago_::_%n minutes ago_" => array(" prieš %n minutę"," prieš %n minučių"," prieš %n minučių"),
+"_%n hour ago_::_%n hours ago_" => array("prieš %n valandą","prieš %n valandų","prieš %n valandų"),
 "today" => "Å¡iandien",
 "yesterday" => "vakar",
 "_%n day ago_::_%n days ago_" => array("","",""),
 "last month" => "praeitą mėnesį",
-"_%n month ago_::_%n months ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("prieš %n mėnesį","prieš %n mėnesius","prieš %n mėnesių"),
 "months ago" => "prieš mėnesį",
 "last year" => "praeitais metais",
 "years ago" => "prieš metus",
@@ -81,11 +82,13 @@ $TRANSLATIONS = array(
 "Email sent" => "Laiškas išsiųstas",
 "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",
 "Use the following link to reset your password: {link}" => "Slaptažodio atkūrimui naudokite šią nuorodą: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Nuorodą su jūsų slaptažodžio atkūrimu buvo nusiųsta jums į paštą.<br>Jei jo negausite per atitinkamą laiką, pasižiūrėkite brukalo aplankale.<br> Jei jo ir ten nėra, teiraukitės administratoriaus.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Klaida!<br>Ar tikrai jūsų el paštas/vartotojo vardas buvo teisingi?",
 "You will receive a link to reset your password via Email." => "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.",
 "Username" => "Prisijungimo vardas",
+"Yes, I really want to reset my password now" => "Taip, aš tikrai noriu atnaujinti slaptažodį",
 "Request reset" => "Prašyti nustatymo iš najo",
 "Your password was reset" => "Jūsų slaptažodis buvo nustatytas iš naujo",
 "To login page" => "Į prisijungimo puslapį",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 6deb5dfda9fb099161c2737fa93872a3e0d7acb8..ddfc60089838eaafa16a3e94ce09fb7e9b7e7a6e 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -126,7 +126,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Pabeigt iestatīšanu",
 "%s is available. Get more information on how to update." => "%s ir pieejams. Uzziniet vairāk kā atjaunināt.",
 "Log out" => "Izrakstīties",
-"More apps" => "Vairāk programmu",
 "Automatic logon rejected!" => "Automātiskā ierakstīšanās ir noraidīta!",
 "If you did not change your password recently, your account may be compromised!" => "Ja neesat pēdējā laikā mainījis paroli, iespējams, ka jūsu konts ir kompromitēts.",
 "Please change your password to secure your account again." => "Lūdzu, nomainiet savu paroli, lai atkal nodrošinātu savu kontu.",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 46375756de42ed708d0b8c67fe612a8990b06148..6a2d1a03a100c8cbdd220cca0ae2bbb8f5f93dc6 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -126,7 +126,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Installatie afronden",
 "%s is available. Get more information on how to update." => "%s is beschikbaar. Verkrijg meer informatie over het bijwerken.",
 "Log out" => "Afmelden",
-"More apps" => "Meer applicaties",
 "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.",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 9be10f535b74d72d79a26d8ba1d9a217896f3dcc..1188e555316e0f8e13d02c0be16b55b37c93afda 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -125,7 +125,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Zakończ konfigurowanie",
 "%s is available. Get more information on how to update." => "%s jest dostępna. Dowiedz się więcej na temat aktualizacji.",
 "Log out" => "Wyloguj",
-"More apps" => "Więcej aplikacji",
 "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.",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 8446e5270a709edb6fb878d297569a5e46667eca..8db5262e94b130f4bdb28148cb3db13aa944d15a 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -126,7 +126,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Concluir configuração",
 "%s is available. Get more information on how to update." => "%s está disponível. Obtenha mais informações sobre como atualizar.",
 "Log out" => "Sair",
-"More apps" => "Mais aplicativos",
 "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.",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 8c29c8d26f6dc180db27a104a1c559c1e1c5a5f3..503ca579ce7bb3bcd6199234262dad8d5cb54f78 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -126,7 +126,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Завершить установку",
 "%s is available. Get more information on how to update." => "%s доступно. Получить дополнительную информацию о порядке обновления.",
 "Log out" => "Выйти",
-"More apps" => "Ещё приложения",
 "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." => "Пожалуйста, смените пароль, чтобы обезопасить свою учетную запись.",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 5fff18e7d6fe09d62a7fb53e050dacd27bb9d463..82745d617e96ee4d3fe4ddbb9474c340a4fec184 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -1,6 +1,12 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s s Vami zdieľa »%s«",
+"Turned on maintenance mode" => "Mód údržby zapnutý",
+"Turned off maintenance mode" => "Mód údržby vypnutý",
+"Updated database" => "Databáza aktualizovaná",
+"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.",
@@ -126,7 +132,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Dokončiť inštaláciu",
 "%s is available. Get more information on how to update." => "%s je dostupná. Získajte viac informácií k postupu aktualizáce.",
 "Log out" => "Odhlásiť",
-"More apps" => "Viac aplikácií",
 "Automatic logon rejected!" => "Automatické prihlásenie bolo zamietnuté!",
 "If you did not change your password recently, your account may be compromised!" => "V nedávnej dobe ste nezmenili svoje heslo, Váš účet môže byť kompromitovaný.",
 "Please change your password to secure your account again." => "Prosím, zmeňte svoje heslo pre opätovné zabezpečenie Vášho účtu",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index cda76a520b4064488b33cf3dcde4ca4b816cc0c2..74d285a35a66ad6bdf5c994bc6baeb08e8d6b8e6 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -1,6 +1,12 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s delade »%s« med dig",
+"Turned on maintenance mode" => "Aktiverade underhållsläge",
+"Turned off maintenance mode" => "Deaktiverade underhållsläge",
+"Updated database" => "Uppdaterade databasen",
+"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",
@@ -126,7 +132,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Avsluta installation",
 "%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",
-"More apps" => "Fler appar",
 "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.",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index dde8a1bd97a991777f80928d82cd562d0620cc89..6dd540579500bc4dc0b90a58444b8d0730b344a0 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -126,7 +126,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Kurulumu tamamla",
 "%s is available. Get more information on how to update." => "%s mevcuttur. Güncelleştirme hakkında daha fazla bilgi alın.",
 "Log out" => "Çıkış yap",
-"More apps" => "Daha fazla Uygulama",
 "Automatic logon rejected!" => "Otomatik oturum açma reddedildi!",
 "If you did not change your password recently, your account may be compromised!" => "Yakın zamanda parolanızı değiştirmedi iseniz hesabınız riske girebilir.",
 "Please change your password to secure your account again." => "Hesabınızı korumak için lütfen parolanızı değiştirin.",
diff --git a/core/l10n/ug.php b/core/l10n/ug.php
index 5cbb90d15f9e6e042a92dda4cbb01cc1a2b8c8e1..eb16e841c676fc880629e5e39da3265ceaad6159 100644
--- a/core/l10n/ug.php
+++ b/core/l10n/ug.php
@@ -45,6 +45,7 @@ $TRANSLATIONS = array(
 "Help" => "ياردەم",
 "Edit categories" => "تۈر تەھرىر",
 "Add" => "قوش",
+"Security Warning" => "بىخەتەرلىك ئاگاھلاندۇرۇش",
 "Advanced" => "ئالىي",
 "Finish setup" => "تەڭشەك تامام",
 "Log out" => "تىزىمدىن چىق"
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
deleted file mode 100644
index 92f1aef88508442ef286eeb48ce69f7877955ef6..0000000000000000000000000000000000000000
--- a/core/l10n/zh_CN.GB2312.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s 与您共享了 »%s« ",
-"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" => "星期二",
-"Wednesday" => "星期三",
-"Thursday" => "星期四",
-"Friday" => "星期五",
-"Saturday" => "星期六",
-"January" => "一月",
-"February" => "二月",
-"March" => "三月",
-"April" => "四月",
-"May" => "五月",
-"June" => "六月",
-"July" => "七月",
-"August" => "八月",
-"September" => "九月",
-"October" => "十月",
-"November" => "十一月",
-"December" => "十二月",
-"Settings" => "设置",
-"seconds ago" => "秒前",
-"_%n minute ago_::_%n minutes ago_" => array("%n 分钟以前"),
-"_%n hour ago_::_%n hours ago_" => array("%n 小时以前"),
-"today" => "今天",
-"yesterday" => "昨天",
-"_%n day ago_::_%n days ago_" => array("%n 天以前"),
-"last month" => "上个月",
-"_%n month ago_::_%n months ago_" => array("%n 个月以前"),
-"months ago" => "月前",
-"last year" => "去年",
-"years ago" => "年前",
-"Choose" => "选择",
-"Error loading file picker template" => "加载文件选取模板出错",
-"Yes" => "是",
-"No" => "否",
-"Ok" => "好的",
-"The object type is not specified." => "未指定对象类型。",
-"Error" => "出错",
-"The app name is not specified." => "未指定应用名称。",
-"The required file {file} is not installed!" => "未安装所需要的文件 {file} ！",
-"Shared" => "已分享",
-"Share" => "分享",
-"Error while sharing" => "分享出错",
-"Error while unsharing" => "取消分享出错",
-"Error while changing permissions" => "变更权限出错",
-"Shared with you and the group {group} by {owner}" => "由 {owner} 与您和 {group} 群组分享",
-"Shared with you by {owner}" => "由 {owner} 与您分享",
-"Share with" => "分享",
-"Share with link" => "分享链接",
-"Password protect" => "密码保护",
-"Password" => "密码",
-"Allow Public Upload" => "允许公众上传",
-"Email link to person" => "面向个人的电子邮件链接",
-"Send" => "发送",
-"Set expiration date" => "设置失效日期",
-"Expiration date" => "失效日期",
-"Share via email:" => "通过电子邮件分享：",
-"No people found" => "查无此人",
-"Resharing is not allowed" => "不允许重复分享",
-"Shared in {item} with {user}" => "已经与 {user} 在 {item} 中分享",
-"Unshare" => "取消分享",
-"can edit" => "可编辑",
-"access control" => "访问控制",
-"create" => "创建",
-"update" => "æ›´æ–°",
-"delete" => "删除",
-"share" => "分享",
-"Password protected" => "密码保护",
-"Error unsetting expiration date" => "取消设置失效日期出错",
-"Error setting expiration date" => "设置失效日期出错",
-"Sending ..." => "发送中……",
-"Email sent" => "电子邮件已发送",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "升级失败。请向<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud社区</a>报告此问题。",
-"The update was successful. Redirecting you to ownCloud now." => "升级成功。现在为您跳转到ownCloud。",
-"%s password reset" => "%s 密码重置",
-"Use the following link to reset your password: {link}" => "使用下面的链接来重置你的密码:{link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "重置密码的连接已经通过邮件到您的邮箱。<br> 如果你没有收到邮件，可能是由于要再等一下，或者检查一下您的垃圾邮件夹。<br> 如果还是没有收到，请联系您的系统管理员。",
-"Request failed!<br>Did you make sure your email/username was right?" => "请求失败！<br> 你确定你的邮件地址/用户名是正确的？",
-"You will receive a link to reset your password via Email." => "你将会收到一个重置密码的链接",
-"Username" => "用户名",
-"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?" => "您的文件是加密的。如果您还没有启用恢复密钥，在重置了密码后，您的数据讲无法恢复回来。如果您不确定是否这么做，请联系您的管理员在继续这个操作。你却是想继续么？",
-"Yes, I really want to reset my password now" => "是的，我想现在重置密码。",
-"Request reset" => "要求重置",
-"Your password was reset" => "你的密码已经被重置了",
-"To login page" => "转至登陆页面",
-"New password" => "新密码",
-"Reset password" => "重置密码",
-"Personal" => "私人",
-"Users" => "用户",
-"Apps" => "程序",
-"Admin" => "管理员",
-"Help" => "帮助",
-"Access forbidden" => "禁止访问",
-"Cloud not found" => "云 没有被找到",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "你好！⏎\n⏎\n温馨提示： %s 与您共享了 %s 。⏎\n查看： %s⏎\n⏎\n祝顺利！",
-"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 。",
-"No secure random number generator is available, please enable the PHP OpenSSL extension." => "没有安全随机码生成器，请启用 PHP OpenSSL 扩展。",
-"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "没有安全随机码生成器，黑客可以预测密码重置令牌并接管你的账户。",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "因为.htaccess文件无效，您的数据文件夹及文件可能可以在互联网上访问。",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "有关如何正确地配置您的服务器，请查看 <a href=\"%s\" target=\"_blank\">文档</a>。",
-"Create an <strong>admin account</strong>" => "建立一个 <strong>管理帐户</strong>",
-"Advanced" => "进阶",
-"Data folder" => "数据存放文件夹",
-"Configure the database" => "配置数据库",
-"will be used" => "将会使用",
-"Database user" => "数据库用户",
-"Database password" => "数据库密码",
-"Database name" => "数据库用户名",
-"Database tablespace" => "数据库表格空间",
-"Database host" => "数据库主机",
-"Finish setup" => "完成安装",
-"%s is available. Get more information on how to update." => "%s 是可用的。获取更多关于升级的信息。",
-"Log out" => "注销",
-"More apps" => "更多应用",
-"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." => "请修改您的密码以保护账户。",
-"Lost your password?" => "忘记密码?",
-"remember" => "记住登录",
-"Log in" => "登陆",
-"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>Cheers!" => "你好！<br><br>温馨提示： %s 与您共享了 %s 。<br><br>\n查看： %s <br><br> 祝顺利！",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud正在升级至 %s 版，这可能需要一点时间。"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index a5a63e248586d77f0668ed9a738d1b728edcecfc..08d70dfee66466a31f3af9fa12c8cd855d9c0662 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -1,6 +1,12 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s 向您分享了 »%s«",
+"Turned on maintenance mode" => "启用维护模式",
+"Turned off maintenance mode" => "关闭维护模式",
+"Updated database" => "数据库已更新",
+"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",
@@ -31,12 +37,12 @@ $TRANSLATIONS = array(
 "Settings" => "设置",
 "seconds ago" => "秒前",
 "_%n minute ago_::_%n minutes ago_" => array("%n 分钟前"),
-"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array("%n 小时前"),
 "today" => "今天",
 "yesterday" => "昨天",
-"_%n day ago_::_%n days ago_" => array(""),
+"_%n day ago_::_%n days ago_" => array("%n 天前"),
 "last month" => "上月",
-"_%n month ago_::_%n months ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("%n 月前"),
 "months ago" => "月前",
 "last year" => "去年",
 "years ago" => "年前",
@@ -47,7 +53,7 @@ $TRANSLATIONS = array(
 "Ok" => "好",
 "The object type is not specified." => "未指定对象类型。",
 "Error" => "错误",
-"The app name is not specified." => "未指定App名称。",
+"The app name is not specified." => "未指定应用名称。",
 "The required file {file} is not installed!" => "所需文件{file}未安装！",
 "Shared" => "已共享",
 "Share" => "分享",
@@ -83,6 +89,7 @@ $TRANSLATIONS = array(
 "Email sent" => "邮件已发送",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "更新不成功。请汇报将此问题汇报给  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社区</a>。",
 "The update was successful. Redirecting you to ownCloud now." => "更新成功。正在重定向至 ownCloud。",
+"%s password reset" => "重置 %s 的密码",
 "Use the following link to reset your password: {link}" => "使用以下链接重置您的密码：{link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "重置密码的链接已发送到您的邮箱。<br>如果您觉得在合理的时间内还未收到邮件，请查看 spam/junk 目录。<br>如果没有在那里，请询问您的本地管理员。",
 "Request failed!<br>Did you make sure your email/username was right?" => "请求失败<br>您确定您的邮箱/用户名是正确的？",
@@ -107,9 +114,11 @@ $TRANSLATIONS = array(
 "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。",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "随机数生成器无效，请启用PHP的OpenSSL扩展",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "没有安全随机码生成器，攻击者可能会猜测密码重置信息从而窃取您的账户",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "您的数据目录和文件可能可以直接被互联网访问，因为 .htaccess 并未正常工作。",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\">此文档</a>。",
 "Create an <strong>admin account</strong>" => "创建<strong>管理员账号</strong>",
 "Advanced" => "高级",
 "Data folder" => "数据目录",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index d2cbb7a8fd3324c60e8ef685de5efd34731b335f..fabec7537d1f36b9a46d0ab337595baee3d6d0c9 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -30,13 +30,13 @@ $TRANSLATIONS = array(
 "December" => "十二月",
 "Settings" => "設定",
 "seconds ago" => "幾秒前",
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n minute ago_::_%n minutes ago_" => array("%n 分鐘前"),
+"_%n hour ago_::_%n hours ago_" => array("%n 小時前"),
 "today" => "今天",
 "yesterday" => "昨天",
-"_%n day ago_::_%n days ago_" => array(""),
+"_%n day ago_::_%n days ago_" => array("%n 天前"),
 "last month" => "上個月",
-"_%n month ago_::_%n months ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("%n 個月前"),
 "months ago" => "幾個月前",
 "last year" => "去年",
 "years ago" => "幾年前",
@@ -83,6 +83,7 @@ $TRANSLATIONS = array(
 "Email sent" => "Email 已寄出",
 "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 密碼重設",
 "Use the following link to reset your password: {link}" => "請至以下連結重設您的密碼： {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "重設密碼的連結已經寄至您的電子郵件信箱，如果您過了一段時間還是沒有收到它，請檢查看看它是不是被放到垃圾郵件了，如果還是沒有的話，請聯絡您的 ownCloud 系統管理員。",
 "Request failed!<br>Did you make sure your email/username was right?" => "請求失敗！<br>您確定填入的電子郵件地址或是帳號名稱是正確的嗎？",
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 3c1114492cb3d59362015f6ad483714f56d572cf..1e0f4a75c3cb1a8e7ca269a2320be61886f9b772 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -78,6 +78,7 @@
 
 		<nav><div id="navigation">
 			<ul id="apps" class="svg">
+				<div class="wrapper"><!-- for sticky footer of apps management -->
 				<?php foreach($_['navigation'] as $entry): ?>
 					<li data-id="<?php p($entry['id']); ?>">
 						<a href="<?php print_unescaped($entry['href']); ?>" title=""
@@ -89,15 +90,19 @@
 						</a>
 					</li>
 				<?php endforeach; ?>
+				<?php if(OC_User::isAdminUser(OC_User::getUser())): ?>
+					<div class="push"></div><!-- for for sticky footer of apps management -->
+				<?php endif; ?>
+				</div>
 
-				<!-- show "More apps" link to app administration directly in app navigation -->
+				<!-- show "More apps" link to app administration directly in app navigation, as sticky footer -->
 				<?php if(OC_User::isAdminUser(OC_User::getUser())): ?>
 					<li id="apps-management">
 						<a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps').'?installed'); ?>" title=""
 							<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
 							<img class="icon svg" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>"/>
 							<span>
-								<?php p($l->t('More apps')); ?>
+								<?php p($l->t('Apps')); ?>
 							</span>
 						</a>
 					</li>
diff --git a/core/templates/login.php b/core/templates/login.php
index 9143510f75732046ffa104f07c4228205d9d3175..ee761f0aa523d5378f8a345379613af19fe90a46 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -21,12 +21,10 @@
 		</p>
 
 		<p class="infield groupbottom">
-			<input type="password" name="password" id="password" value="" data-typetoggle="#show" placeholder=""
+			<input type="password" name="password" id="password" value="" placeholder=""
 				   required<?php p($_['user_autofocus'] ? '' : ' autofocus'); ?> />
 			<label for="password" class="infield"><?php p($l->t('Password')); ?></label>
 			<img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
-			<input type="checkbox" id="show" name="show" />
-			<label for="show"></label>
 		</p>
 
 		<?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index 5673ceabd3337a609db0816a6642a9a3636f0eef..bf1d8334e31a388a14504a444e049752a6d088fc 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -193,23 +222,23 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr ""
 
@@ -442,7 +471,7 @@ msgstr "Persoonlik"
 msgid "Users"
 msgstr "Gebruikers"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Toepassings"
 
@@ -575,10 +604,6 @@ msgstr ""
 msgid "Log out"
 msgstr "Teken uit"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -593,19 +618,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Jou wagwoord verloor?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "onthou"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Teken aan"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/af_ZA/files.po b/l10n/af_ZA/files.po
index 6ebf523c19f18a496a5e0e9818552a7a91399dc8..e02365d6370df92d4ba4ead7d22e37e013cd4558 100644
--- a/l10n/af_ZA/files.po
+++ b/l10n/af_ZA/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -74,7 +74,11 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr ""
 
@@ -124,41 +127,57 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -196,34 +215,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -327,22 +330,6 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index a89b43a8722fa9e783bffc42e04035af6e95e00f..c9594857940c2ac1686b251dd1e7fbf2382acfcf 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "نوع التصنيف لم يدخل"
@@ -209,23 +238,23 @@ msgstr "السنةالماضية"
 msgid "years ago"
 msgstr "سنة مضت"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "اختيار"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "نعم"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "لا"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "موافق"
 
@@ -458,7 +487,7 @@ msgstr "شخصي"
 msgid "Users"
 msgstr "المستخدمين"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "التطبيقات"
 
@@ -591,10 +620,6 @@ msgstr ""
 msgid "Log out"
 msgstr "الخروج"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "تم رفض تسجيل الدخول التلقائي!"
@@ -609,19 +634,19 @@ msgstr "قد يكون حسابك في خطر إن لم تقم بإعادة تع
 msgid "Please change your password to secure your account again."
 msgstr "الرجاء إعادة تعيين كلمة السر لتأمين حسابك."
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "هل نسيت كلمة السر؟"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "تذكر"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "أدخل"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "اسماء دخول بديلة"
 
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index e9f43521101c648d00f895e5d50698f013e6cc31..b8086649e4ae4f08ff66c3749d764afc89675c23 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -74,7 +74,11 @@ msgstr "خطأ في الكتابة على القرص الصلب"
 msgid "Not enough storage available"
 msgstr "لا يوجد مساحة تخزينية كافية"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "مسار غير صحيح."
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr "تم إلغاء عملية رفع الملفات ."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات."
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "عنوان ال URL  لا يجوز أن يكون فارغا."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "خطأ"
 
@@ -124,35 +127,59 @@ msgstr "حذف بشكل دائم"
 msgid "Rename"
 msgstr "إعادة تسميه"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "قيد الانتظار"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} موجود مسبقا"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "استبدال"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "اقترح إسم"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "إلغاء"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "استبدل {new_name}  بـ  {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "تراجع"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -162,7 +189,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -200,42 +227,18 @@ msgid ""
 "big."
 msgstr "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "إسم مجلد غير صحيح. استخدام مصطلح \"Shared\" محجوز للنظام"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "اسم"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "حجم"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "معدل"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -339,22 +342,6 @@ msgstr "يرجى الانتظار , جاري فحص الملفات ."
 msgid "Current scanning"
 msgstr "الفحص الحالي"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "تحديث ذاكرة التخزين المؤقت(الكاش)  الخاصة بملفات النظام ..."
diff --git a/l10n/be/core.po b/l10n/be/core.po
index a0b09af764b1d99591e297a451f4820047b3908b..5f2b7f50b2eb2cef51c1576a571ade74f3ac4140 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -201,23 +230,23 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr ""
 
@@ -450,7 +479,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr ""
 
@@ -583,10 +612,6 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -601,19 +626,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/be/files.po b/l10n/be/files.po
index dab1498b5ce47f4d4d23fce90d116280304302ac..ef6881506f8bff642b27d47ea6c2bf84614e839c 100644
--- a/l10n/be/files.po
+++ b/l10n/be/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -74,7 +74,11 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr ""
 
@@ -124,35 +127,55 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -160,7 +183,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -198,38 +221,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -333,22 +336,6 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 0a88faaffc13a0503b1b2a07ede3592d86c9a6a7..b95f90370d704bb1246aff443615483908e9bdd3 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -193,23 +222,23 @@ msgstr "последната година"
 msgid "years ago"
 msgstr "последните години"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Да"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Не"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Добре"
 
@@ -442,7 +471,7 @@ msgstr "Лични"
 msgid "Users"
 msgstr "Потребители"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Приложения"
 
@@ -575,10 +604,6 @@ msgstr ""
 msgid "Log out"
 msgstr "Изход"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -593,19 +618,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Забравена парола?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "запомни"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Вход"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 9224fb6a328042517be48a87c8b0f1cb971b945e..a57ea88b76fb6339d3ef837921d61a4e1330c875 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +74,11 @@ msgstr "Възникна проблем при запис в диска"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Невалидна директория."
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr "Качването е спряно."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Грешка"
 
@@ -124,41 +127,57 @@ msgstr "Изтриване завинаги"
 msgid "Rename"
 msgstr "Преименуване"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Чакащо"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "препокриване"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "отказ"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "възтановяване"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -196,34 +215,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Променено"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -327,22 +330,6 @@ msgstr "Файловете се претърсват, изчакайте."
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "файл"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index b4dcaa3e01635b0036dc1888803082519f8e24ba..9be574c0eb762fb6f20ea3dae7fa5db655d69daa 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "ক্যাটেগরির ধরণটি প্রদান করা হয় নি।"
@@ -193,23 +222,23 @@ msgstr "গত বছর"
 msgid "years ago"
 msgstr "বছর পূর্বে"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "বেছে নিন"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "হ্যাঁ"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "না"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "তথাস্তু"
 
@@ -442,7 +471,7 @@ msgstr "ব্যক্তিগত"
 msgid "Users"
 msgstr "ব্যবহারকারী"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "অ্যাপ"
 
@@ -575,10 +604,6 @@ msgstr ""
 msgid "Log out"
 msgstr "প্রস্থান"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -593,19 +618,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "কূটশব্দ হারিয়েছেন?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "মনে রাখ"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "প্রবেশ"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index dfaafb4e1005114b381bbf5d64951a0a70939faa..de8d7478780f0bad0ba270101eb01e4faaa9c7ae 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +74,11 @@ msgstr "ডিস্কে লিখতে ব্যর্থ"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "ভুল ডিরেক্টরি"
 
@@ -94,21 +98,20 @@ msgstr "যথেষ্ঠ পরিমাণ স্থান নেই"
 msgid "Upload cancelled."
 msgstr "আপলোড বাতিল করা হয়েছে।"
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।"
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL ফাঁকা রাখা যাবে না।"
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "সমস্যা"
 
@@ -124,41 +127,57 @@ msgstr ""
 msgid "Rename"
 msgstr "পূনঃনামকরণ"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "মুলতুবি"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} টি বিদ্যমান"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "প্রতিস্থাপন"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "নাম সুপারিশ করুন"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "বাতিল"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "ক্রিয়া প্রত্যাহার"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -196,34 +215,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "ফোল্ডারের নামটি সঠিক নয়। 'ভাগাভাগি করা' শুধুমাত্র Owncloud  এর জন্য সংরক্ষিত।"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "রাম"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "আকার"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "পরিবর্তিত"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -327,22 +330,6 @@ msgstr "ফাইলগুলো স্ক্যান করা হচ্ছে
 msgid "Current scanning"
 msgstr "বর্তমান স্ক্যানিং"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/bs/core.po b/l10n/bs/core.po
index aaec19afacd333e39f83879055f1bf96fa07c3f2..cb3399fb366695fc0961df6644e47c93adac9655 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -197,23 +226,23 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr ""
 
@@ -446,7 +475,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr ""
 
@@ -579,10 +608,6 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -597,19 +622,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/bs/files.po b/l10n/bs/files.po
index bd25245e3aef17b71fbb5520c4f3d96e614741f5..6c304b9289908f04cb790f93e66bbadce26b7e39 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +74,11 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr ""
 
@@ -124,42 +127,60 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -197,36 +218,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -330,22 +333,6 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 3d5fb3ae4802ceb2fba227d2f8a4a69646015470..21836c30a8b813a1e944734713b80d1780f16f68 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/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-08-22 10:36-0400\n"
-"PO-Revision-Date: 2013-08-21 15:50+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,6 +24,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s ha compartit »%s« amb tu"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "No s'ha especificat el tipus de categoria."
@@ -444,7 +473,7 @@ msgstr "Personal"
 msgid "Users"
 msgstr "Usuaris"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Aplicacions"
 
@@ -577,10 +606,6 @@ msgstr "%s està disponible. Obtingueu més informació de com actualitzar."
 msgid "Log out"
 msgstr "Surt"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Més aplicacions"
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "L'ha rebutjat l'acceditació automàtica!"
@@ -595,19 +620,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Heu perdut la contrasenya?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "recorda'm"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Inici de sessió"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Acreditacions alternatives"
 
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 6912e2cea9de654a20165cf968e664fd59fa4a9b..8bedc7b36182193d742cd60eb08856862a264a37 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/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-08-22 10:35-0400\n"
-"PO-Revision-Date: 2013-08-21 16:01+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -76,7 +76,11 @@ msgstr "Ha fallat en escriure al disc"
 msgid "Not enough storage available"
 msgstr "No hi ha prou espai disponible"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Directori no vàlid."
 
@@ -96,21 +100,20 @@ msgstr "No hi ha prou espai disponible"
 msgid "Upload cancelled."
 msgstr "La pujada s'ha cancel·lat."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:234 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "La URL no pot ser buida"
 
-#: js/file-upload.js:239 lib/app.php:53
+#: js/file-upload.js:244 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:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Error"
 
@@ -126,41 +129,57 @@ msgstr "Esborra permanentment"
 msgid "Rename"
 msgstr "Reanomena"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Pendent"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} ja existeix"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "substitueix"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "sugereix un nom"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "cancel·la"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "s'ha substituït {old_name} per {new_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "desfés"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n carpeta"
+msgstr[1] "%n carpetes"
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n fitxer"
+msgstr[1] "%n fitxers"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Pujant %n fitxer"
 msgstr[1] "Pujant %n fitxers"
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "fitxers pujant"
 
@@ -198,34 +217,18 @@ msgid ""
 "big."
 msgstr "S'està preparant la baixada. Pot trigar una estona si els fitxers són grans."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Mida"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n carpeta"
-msgstr[1] "%n carpetes"
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n fitxer"
-msgstr[1] "%n fitxers"
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -329,22 +332,6 @@ msgstr "S'estan escanejant els fitxers, espereu"
 msgid "Current scanning"
 msgstr "Actualment escanejant"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "directori"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "directoris"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fitxer"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "fitxers"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Actualitzant la memòria de cau del sistema de fitxers..."
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index e24f7b3eafafb052184f8e258984fcc1d9e17bf1..6e9651339a2fa1f4b3908eceab6bb84fdc8881bd 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-26 13:40+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"
@@ -23,11 +23,11 @@ msgstr ""
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "L'aplicació \"%s\" no es pot instal·lar perquè no és compatible amb aquesta versió d'ownCloud."
 
 #: app.php:250
 msgid "No app name specified"
-msgstr ""
+msgstr "No heu especificat cap nom d'aplicació"
 
 #: app.php:361
 msgid "Help"
@@ -87,59 +87,59 @@ msgstr "Baixeu els fitxers en trossos petits, de forma separada, o pregunteu a l
 
 #: installer.php:63
 msgid "No source specified when installing app"
-msgstr ""
+msgstr "No heu especificat la font en instal·lar l'aplicació"
 
 #: installer.php:70
 msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "No heu especificat href en instal·lar l'aplicació des de http"
 
 #: installer.php:75
 msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "No heu seleccionat el camí en instal·lar una aplicació des d'un fitxer local"
 
 #: installer.php:89
 #, php-format
 msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Els fitxers del tipus %s no són compatibles"
 
 #: installer.php:103
 msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Ha fallat l'obertura del fitxer en instal·lar l'aplicació"
 
 #: installer.php:123
 msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "L'aplicació no proporciona un fitxer info.xml"
 
 #: installer.php:129
 msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "L'aplicació no es pot instal·lar perquè hi ha codi no autoritzat en l'aplicació"
 
 #: installer.php:138
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
-msgstr ""
+msgstr "L'aplicació no es pot instal·lar perquè no és compatible amb aquesta versió d'ownCloud"
 
 #: installer.php:144
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
-msgstr ""
+msgstr "L'aplicació no es pot instal·lar perquè conté l'etiqueta <shipped>vertader</shipped> que no es permet per aplicacions no enviades"
 
 #: installer.php:150
 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 ""
+msgstr "L'aplicació no es pot instal·lar perquè la versió a info.xml/version no és la mateixa que la versió indicada des de la botiga d'aplicacions"
 
 #: installer.php:160
 msgid "App directory already exists"
-msgstr ""
+msgstr "La carpeta de l'aplicació ja existeix"
 
 #: installer.php:173
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "No es pot crear la carpeta de l'aplicació. Arregleu els permisos. %s"
 
 #: json.php:28
 msgid "Application is not enabled"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 1ecfd6e7b8ba44526c32e50e443b4696c495aaf6..00860a8a12d11a7084842db099f09f3998ae0a3e 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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-26 13:31+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"
@@ -104,11 +104,11 @@ msgstr "Espereu..."
 
 #: js/apps.js:71 js/apps.js:72 js/apps.js:92
 msgid "Error while disabling app"
-msgstr ""
+msgstr "Error en desactivar l'aplicació"
 
 #: js/apps.js:91 js/apps.js:104 js/apps.js:105
 msgid "Error while enabling app"
-msgstr ""
+msgstr "Error en activar l'aplicació"
 
 #: js/apps.js:115
 msgid "Updating...."
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 8c6b13494d94024f54ca8dffb1ec0c7af574c489..102b8a3d7bbec67594c477b62d18f431c658e9db 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-26 13:31+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"
@@ -156,7 +156,7 @@ msgstr "Filtre d'inici de sessió d'usuari"
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action. Example: \"uid=%%uid\""
-msgstr ""
+msgstr "Defineix el filtre a aplicar quan s'intenta iniciar la sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió. Per exemple: \"uid=%%uid\""
 
 #: templates/settings.php:55
 msgid "User List Filter"
@@ -166,7 +166,7 @@ msgstr "Llista de filtres d'usuari"
 msgid ""
 "Defines the filter to apply, when retrieving users (no placeholders). "
 "Example: \"objectClass=person\""
-msgstr ""
+msgstr "Defineix el filtre a aplicar quan es mostren usuaris (no textos variables). Per exemple: \"objectClass=person\""
 
 #: templates/settings.php:59
 msgid "Group Filter"
@@ -176,7 +176,7 @@ msgstr "Filtre de grup"
 msgid ""
 "Defines the filter to apply, when retrieving groups (no placeholders). "
 "Example: \"objectClass=posixGroup\""
-msgstr ""
+msgstr "Defineix el filtre a aplicar quan es mostren grups (no textos variables). Per exemple: \"objectClass=posixGroup\""
 
 #: templates/settings.php:66
 msgid "Connection Settings"
@@ -237,7 +237,7 @@ msgstr "Desactiva la validació de certificat SSL."
 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 ""
+msgstr "No es recomana, useu-ho només com a prova! Importeu el certificat SSL del servidor LDAP al servidor %s només si la connexió funciona amb aquesta opció."
 
 #: templates/settings.php:76
 msgid "Cache Time-To-Live"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 37ee596b32414d7280a9d8aa7b238aab128407c5..41edc0ee8a092c54ed9fe312f3ca796bfb7cbf8f 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -27,6 +27,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s s vámi sdílí »%s«"
 
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr "Zapnut režim údržby"
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr "Vypnut režim údržby"
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr "Zaktualizována databáze"
+
+#: ajax/update.php:20
+msgid "Updating filecache, this may take really long..."
+msgstr "Aktualizuji souborovou mezipaměť, toto může trvat opravdu dlouho..."
+
+#: ajax/update.php:23
+msgid "Updated filecache"
+msgstr "Aktualizována souborová mezipaměť"
+
+#: ajax/update.php:26
+#, php-format
+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."
@@ -202,23 +231,23 @@ msgstr "minulý rok"
 msgid "years ago"
 msgstr "před lety"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Vybrat"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "Chyba při načítání šablony výběru souborů"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Ano"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Ne"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Ok"
 
@@ -451,7 +480,7 @@ msgstr "Osobní"
 msgid "Users"
 msgstr "Uživatelé"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Aplikace"
 
@@ -584,10 +613,6 @@ msgstr "%s je dostupná. Získejte více informací k postupu aktualizace."
 msgid "Log out"
 msgstr "Odhlásit se"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Více aplikací"
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatické přihlášení odmítnuto!"
@@ -602,19 +627,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Ztratili jste své heslo?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "zapamatovat"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Přihlásit"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Alternativní přihlášení"
 
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index a83237e41fc9b7425fc6c04a13ab28bd781c480c..94cdb7b62b6060fbfd9d8440e31c3f8346a6a15b 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/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-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-20 15:51+0000\n"
-"Last-Translator: cvanca <mrs.jenkins.oh.yeah@gmail.com>\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -78,7 +78,11 @@ msgstr "Zápis na disk selhal"
 msgid "Not enough storage available"
 msgstr "Nedostatek dostupného úložného prostoru"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Neplatný adresář"
 
@@ -98,21 +102,20 @@ msgstr "Nedostatek volného místa"
 msgid "Upload cancelled."
 msgstr "Odesílání zrušeno."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:234 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL nemůže být prázdná."
 
-#: js/file-upload.js:239 lib/app.php:53
+#: js/file-upload.js:244 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:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Chyba"
 
@@ -128,42 +131,60 @@ msgstr "Trvale odstranit"
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Nevyřízené"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} již existuje"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "nahradit"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "navrhnout název"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "zrušit"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "nahrazeno {new_name} s {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "vrátit zpět"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+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:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n soubor"
+msgstr[1] "%n soubory"
+msgstr[2] "%n souborů"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Nahrávám %n soubor"
 msgstr[1] "Nahrávám %n soubory"
 msgstr[2] "Nahrávám %n souborů"
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "soubory se odesílají"
 
@@ -193,7 +214,7 @@ msgstr "Vaše úložiště je téměř plné ({usedSpacePercent}%)"
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
-msgstr "Šifrování bylo zrušeno, soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde si složky odšifrujete."
+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:245
 msgid ""
@@ -201,36 +222,18 @@ msgid ""
 "big."
 msgstr "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Neplatný název složky. Pojmenování 'Shared' je rezervováno pro vnitřní potřeby ownCloud"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Název"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Upraveno"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n složka"
-msgstr[1] "%n složky"
-msgstr[2] "%n složek"
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n soubor"
-msgstr[1] "%n soubory"
-msgstr[2] "%n souborů"
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -334,22 +337,6 @@ msgstr "Soubory se prohledávají, prosím čekejte."
 msgid "Current scanning"
 msgstr "Aktuální prohledávání"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "adresář"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "adresáře"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "soubor"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "soubory"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Aktualizuji mezipaměť souborového systému..."
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index d64ce09fe359402fe0d4d2e57f67fa99726f5891..71b739cfa3bdf70a17b9b52216babfa725cd8475 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-30 09:33-0400\n"
+"PO-Revision-Date: 2013-08-30 07:31+0000\n"
+"Last-Translator: pstast <petr@stastny.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"
@@ -25,11 +25,11 @@ msgstr ""
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "Aplikace \"%s\" nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud."
 
 #: app.php:250
 msgid "No app name specified"
-msgstr ""
+msgstr "Nebyl zadan název aplikace"
 
 #: app.php:361
 msgid "Help"
@@ -89,59 +89,59 @@ msgstr "Stáhněte soubory po menších částech, samostatně, nebo se obraťte
 
 #: installer.php:63
 msgid "No source specified when installing app"
-msgstr ""
+msgstr "Nebyl zadán zdroj při instalaci aplikace"
 
 #: installer.php:70
 msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Nebyl zadán odkaz pro instalaci aplikace z HTTP"
 
 #: installer.php:75
 msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Nebyla zadána cesta pro instalaci aplikace z místního souboru"
 
 #: installer.php:89
 #, php-format
 msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Archivy typu %s nejsou podporovány"
 
 #: installer.php:103
 msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Chyba při otevírání archivu během instalace aplikace"
 
 #: installer.php:123
 msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "Aplikace neposkytuje soubor info.xml"
 
 #: installer.php:129
 msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Aplikace nemůže být nainstalována, protože obsahuje nepovolený kód"
 
 #: installer.php:138
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
-msgstr ""
+msgstr "Aplikace nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud"
 
 #: installer.php:144
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
-msgstr ""
+msgstr "Aplikace nemůže být nainstalována, protože obsahuje značku\n<shipped>\n\ntrue\n</shipped>\n\ncož není povoleno pro nedodávané aplikace"
 
 #: installer.php:150
 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 ""
+msgstr "Aplikace nemůže být nainstalována, protože verze uvedená v info.xml/version nesouhlasí s verzí oznámenou z úložiště aplikací."
 
 #: installer.php:160
 msgid "App directory already exists"
-msgstr ""
+msgstr "Adresář aplikace již existuje"
 
 #: installer.php:173
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Nelze vytvořit složku aplikace. Opravte práva souborů. %s"
 
 #: json.php:28
 msgid "Application is not enabled"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 9cb3b6446f8b1f03ef7d934e7633b942526ab62d..d3f48fd240dbcbcc7291aa7a9afd4154c130c37d 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-30 09:33-0400\n"
+"PO-Revision-Date: 2013-08-28 16:41+0000\n"
+"Last-Translator: pstast <petr@stastny.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"
@@ -88,53 +88,53 @@ msgstr "Nelze odebrat uživatele ze skupiny %s"
 msgid "Couldn't update app."
 msgstr "Nelze aktualizovat aplikaci."
 
-#: js/apps.js:35
+#: js/apps.js:43
 msgid "Update to {appversion}"
 msgstr "Aktualizovat na {appversion}"
 
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
 msgid "Disable"
 msgstr "Zakázat"
 
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
 msgid "Enable"
 msgstr "Povolit"
 
-#: js/apps.js:63
+#: js/apps.js:71
 msgid "Please wait...."
 msgstr "Čekejte prosím..."
 
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
 msgid "Error while disabling app"
-msgstr ""
+msgstr "Chyba při zakazování aplikace"
 
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
 msgid "Error while enabling app"
-msgstr ""
+msgstr "Chyba při povolování aplikace"
 
-#: js/apps.js:115
+#: js/apps.js:123
 msgid "Updating...."
 msgstr "Aktualizuji..."
 
-#: js/apps.js:118
+#: js/apps.js:126
 msgid "Error while updating app"
 msgstr "Chyba při aktualizaci aplikace"
 
-#: js/apps.js:118
+#: js/apps.js:126
 msgid "Error"
 msgstr "Chyba"
 
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
 msgid "Update"
 msgstr "Aktualizovat"
 
-#: js/apps.js:122
+#: js/apps.js:130
 msgid "Updated"
 msgstr "Aktualizováno"
 
 #: js/personal.js:150
 msgid "Decrypting files... Please wait, this can take some time."
-msgstr "Probíhá odšifrování souborů... Prosíme počkejte, tato operace může trvat několik minut."
+msgstr "Probíhá dešifrování souborů... Čekejte prosím, tato operace může trvat nějakou dobu."
 
 #: js/personal.js:172
 msgid "Saving..."
@@ -483,11 +483,11 @@ msgstr "Šifrování"
 
 #: templates/personal.php:119
 msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr "Šifrovací aplikace již není spuštěna, odšifrujte všechny své soubory"
+msgstr "Šifrovací aplikace již není zapnuta, odšifrujte všechny své soubory"
 
 #: templates/personal.php:125
 msgid "Log-in password"
-msgstr "Heslo"
+msgstr "Přihlašovací heslo"
 
 #: templates/personal.php:130
 msgid "Decrypt all Files"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 6245bd4e833e4f1264e259aa519c87b7f61861b3..6617ad24829dd21fc98903b916c1bf5326df56e6 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-08-21 08:11-0400\n"
-"PO-Revision-Date: 2013-08-20 17:00+0000\n"
-"Last-Translator: cvanca <mrs.jenkins.oh.yeah@gmail.com>\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-28 16:52+0000\n"
+"Last-Translator: pstast <petr@stastny.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"
@@ -159,7 +159,7 @@ msgstr "Filtr přihlášení uživatelů"
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action. Example: \"uid=%%uid\""
-msgstr "Určuje použitý filtr, při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad \"uid=%%uid\""
+msgstr "Určuje použitý filtr při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad: \"uid=%%uid\""
 
 #: templates/settings.php:55
 msgid "User List Filter"
@@ -169,7 +169,7 @@ msgstr "Filtr seznamu uživatelů"
 msgid ""
 "Defines the filter to apply, when retrieving users (no placeholders). "
 "Example: \"objectClass=person\""
-msgstr "Určuje použitý filtr pro získávaní uživatelů (bez zástupných znaků). Příklad: \"objectClass=person\""
+msgstr "Určuje použitý filtr při získávání uživatelů (bez zástupných znaků). Příklad: \"objectClass=person\""
 
 #: templates/settings.php:59
 msgid "Group Filter"
@@ -179,7 +179,7 @@ msgstr "Filtr skupin"
 msgid ""
 "Defines the filter to apply, when retrieving groups (no placeholders). "
 "Example: \"objectClass=posixGroup\""
-msgstr "Určuje použitý filtr, pro získávaní skupin (bez zástupných znaků). Příklad: \"objectClass=posixGroup\""
+msgstr "Určuje použitý filtr při získávání skupin (bez zástupných znaků). Příklad: \"objectClass=posixGroup\""
 
 #: templates/settings.php:66
 msgid "Connection Settings"
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index f9b74a7649e5813ae4caabc0a55859b186d8b22c..638507e646f34ca7ac3a7c46100d3ea69af4ea83 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -23,6 +23,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Math o gategori heb ei ddarparu."
@@ -202,23 +231,23 @@ msgstr "y llynedd"
 msgid "years ago"
 msgstr "blwyddyn yn ôl"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Dewisiwch"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Ie"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Na"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Iawn"
 
@@ -451,7 +480,7 @@ msgstr "Personol"
 msgid "Users"
 msgstr "Defnyddwyr"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Pecynnau"
 
@@ -584,10 +613,6 @@ msgstr "%s ar gael. Mwy o wybodaeth am sut i ddiweddaru."
 msgid "Log out"
 msgstr "Allgofnodi"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Gwrthodwyd mewngofnodi awtomatig!"
@@ -602,19 +627,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Wedi colli'ch cyfrinair?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "cofio"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Mewngofnodi"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Mewngofnodiadau Amgen"
 
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index a5c216a535539921823f4584d00e069eeb81b968..c1e83e56cc9b152f56332c8e78d70c7eea205e26 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +74,11 @@ msgstr "Methwyd ysgrifennu i'r ddisg"
 msgid "Not enough storage available"
 msgstr "Dim digon o le storio ar gael"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Cyfeiriadur annilys."
 
@@ -94,21 +98,20 @@ msgstr "Dim digon o le ar gael"
 msgid "Upload cancelled."
 msgstr "Diddymwyd llwytho i fyny."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "Does dim hawl cael URL gwag."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Gwall"
 
@@ -124,35 +127,55 @@ msgstr "Dileu'n barhaol"
 msgid "Rename"
 msgstr "Ailenwi"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "I ddod"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} yn bodoli'n barod"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "amnewid"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "awgrymu enw"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "diddymu"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "newidiwyd {new_name} yn lle {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "dadwneud"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -160,7 +183,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "ffeiliau'n llwytho i fyny"
 
@@ -198,38 +221,18 @@ msgid ""
 "big."
 msgstr "Wrthi'n paratoi i lwytho i lawr. Gall gymryd peth amser os yw'r ffeiliau'n fawr."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Enw plygell annilys. Mae'r defnydd o 'Shared' yn cael ei gadw gan Owncloud"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Enw"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Maint"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Addaswyd"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -333,22 +336,6 @@ msgstr "Arhoswch, mae ffeiliau'n cael eu sganio."
 msgid "Current scanning"
 msgstr "Sganio cyfredol"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Uwchraddio storfa system ffeiliau..."
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 4f224cbacac08d75224ee479d4e64862cb1acb12..5c71f405c59c619230cee0d5c563a3f088cbd983 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -26,6 +26,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s delte »%s« med sig"
 
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr "Startede vedligeholdelsestilstand"
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr "standsede vedligeholdelsestilstand"
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr "Opdaterede database"
+
+#: ajax/update.php:20
+msgid "Updating filecache, this may take really long..."
+msgstr "Opdatere filcache, dette kan tage rigtigt lang tid..."
+
+#: ajax/update.php:23
+msgid "Updated filecache"
+msgstr "Opdaterede filcache"
+
+#: ajax/update.php:26
+#, php-format
+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."
@@ -197,23 +226,23 @@ msgstr "sidste år"
 msgid "years ago"
 msgstr "Ã¥r siden"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Vælg"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "Fejl ved indlæsning af filvælger skabelon"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Nej"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "OK"
 
@@ -446,7 +475,7 @@ msgstr "Personligt"
 msgid "Users"
 msgstr "Brugere"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Apps"
 
@@ -579,10 +608,6 @@ msgstr "%s er tilgængelig. Få mere information om, hvordan du opdaterer."
 msgid "Log out"
 msgstr "Log ud"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Flere programmer"
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatisk login afvist!"
@@ -597,19 +622,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Mistet dit kodeord?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "husk"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Log ind"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Alternative logins"
 
diff --git a/l10n/da/files.po b/l10n/da/files.po
index afba58f1333c222f5dc93d0d2ac5bf68f5b20e62..3f9da02827cb571ce72a3b016b86ac192ff2602b 100644
--- a/l10n/da/files.po
+++ b/l10n/da/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-24 14:30+0000\n"
-"Last-Translator: Sappe\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -77,7 +77,11 @@ msgstr "Fejl ved skrivning til disk."
 msgid "Not enough storage available"
 msgstr "Der er ikke nok plads til rådlighed"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Ugyldig mappe."
 
@@ -97,21 +101,20 @@ msgstr "ikke nok tilgængelig ledig plads "
 msgid "Upload cancelled."
 msgstr "Upload afbrudt."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:234 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URLen kan ikke være tom."
 
-#: js/file-upload.js:239 lib/app.php:53
+#: js/file-upload.js:244 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:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Fejl"
 
@@ -127,41 +130,57 @@ msgstr "Slet permanent"
 msgid "Rename"
 msgstr "Omdøb"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Afventer"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} eksisterer allerede"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "erstat"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "foreslå navn"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "fortryd"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "erstattede {new_name} med {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "fortryd"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n mappe"
+msgstr[1] "%n mapper"
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n fil"
+msgstr[1] "%n filer"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Uploader %n fil"
 msgstr[1] "Uploader %n filer"
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "uploader filer"
 
@@ -199,34 +218,18 @@ msgid ""
 "big."
 msgstr "Dit download forberedes. Dette kan tage lidt tid ved større filer."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Ændret"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n mappe"
-msgstr[1] "%n mapper"
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n fil"
-msgstr[1] "%n filer"
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -330,22 +333,6 @@ msgstr "Filerne bliver indlæst, vent venligst."
 msgid "Current scanning"
 msgstr "Indlæser"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "mappe"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "Mapper"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fil"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "filer"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Opgraderer filsystems cachen..."
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index 7873b58ef50f6294ec634f334c40d9c30fca15ed..d6c79b185e9265a0754298265f99364594fd5572 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-30 09:33-0400\n"
+"PO-Revision-Date: 2013-08-29 05:10+0000\n"
+"Last-Translator: claus_chr <claus_chr@webspeed.dk>\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"
@@ -25,11 +25,11 @@ msgstr ""
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "App'en \"%s\" kan ikke blive installeret, da den ikke er kompatibel med denne version af ownCloud."
 
 #: app.php:250
 msgid "No app name specified"
-msgstr ""
+msgstr "Intet app-navn angivet"
 
 #: app.php:361
 msgid "Help"
@@ -89,59 +89,59 @@ msgstr "Download filerne i små bider, seperat, eller kontakt venligst din admin
 
 #: installer.php:63
 msgid "No source specified when installing app"
-msgstr ""
+msgstr "Ingen kilde angivet under installation af app"
 
 #: installer.php:70
 msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Ingen href angivet under installation af app via http"
 
 #: installer.php:75
 msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Ingen sti angivet under installation af app fra lokal fil"
 
 #: installer.php:89
 #, php-format
 msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Arkiver af type %s understøttes ikke"
 
 #: installer.php:103
 msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Kunne ikke åbne arkiv under installation af appen"
 
 #: installer.php:123
 msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "Der følger ingen info.xml-fil med appen"
 
 #: installer.php:129
 msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Appen kan ikke installeres, da den indeholder ikke-tilladt kode"
 
 #: installer.php:138
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
-msgstr ""
+msgstr "Appen kan ikke installeres, da den ikke er kompatibel med denne version af ownCloud."
 
 #: installer.php:144
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
-msgstr ""
+msgstr "Appen kan ikke installeres, da den indeholder taget\n<shipped>\n\ntrue\n</shipped>\n\nhvilket ikke er tilladt for ikke-medfølgende apps"
 
 #: installer.php:150
 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 ""
+msgstr "App kan ikke installeres, da versionen i info.xml/version ikke er den samme som versionen rapporteret fra app-storen"
 
 #: installer.php:160
 msgid "App directory already exists"
-msgstr ""
+msgstr "App-mappe findes allerede"
 
 #: installer.php:173
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Kan ikke oprette app-mappe. Ret tilladelser. %s"
 
 #: json.php:28
 msgid "Application is not enabled"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index f3bdc23e48657d1b34f093c2f984d50f6b4713c9..5119c9950a22a2f0e070746a8e97ddef32f4e868 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-28 06:22-0400\n"
+"PO-Revision-Date: 2013-08-27 15:40+0000\n"
+"Last-Translator: Sappe\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"
@@ -105,11 +105,11 @@ msgstr "Vent venligst..."
 
 #: js/apps.js:71 js/apps.js:72 js/apps.js:92
 msgid "Error while disabling app"
-msgstr ""
+msgstr "Kunne ikke deaktivere app"
 
 #: js/apps.js:91 js/apps.js:104 js/apps.js:105
 msgid "Error while enabling app"
-msgstr ""
+msgstr "Kunne ikke aktivere app"
 
 #: js/apps.js:115
 msgid "Updating...."
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 707d01e384e492147c7783b0cec2324ae2b608b6..23574ea9813420320303b6e3e07cc5a0daacb4a2 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -30,6 +30,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s teilte »%s« mit Ihnen"
 
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr "Wartungsmodus eingeschaltet"
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr "Wartungsmodus ausgeschaltet"
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr "Datenbank aktualisiert"
+
+#: ajax/update.php:20
+msgid "Updating filecache, this may take really long..."
+msgstr "Aktualisiere Dateicache, dies könnte eine Weile dauern..."
+
+#: ajax/update.php:23
+msgid "Updated filecache"
+msgstr "Dateicache aktualisiert"
+
+#: ajax/update.php:26
+#, php-format
+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."
@@ -201,23 +230,23 @@ msgstr "Letztes Jahr"
 msgid "years ago"
 msgstr "Vor Jahren"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Auswählen"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "Dateiauswahltemplate konnte nicht geladen werden"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Nein"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "OK"
 
@@ -450,7 +479,7 @@ msgstr "Persönlich"
 msgid "Users"
 msgstr "Benutzer"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Apps"
 
@@ -583,10 +612,6 @@ msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen e
 msgid "Log out"
 msgstr "Abmelden"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Mehr Apps"
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatischer Login zurückgewiesen!"
@@ -601,19 +626,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Passwort vergessen?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "merken"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Einloggen"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Alternative Logins"
 
diff --git a/l10n/de/files.po b/l10n/de/files.po
index d1a6526c48256fb2e874aeedd19d3497ccd851c1..eb931d392142073cf029c012f4b0fd9dbf9b8b43 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-20 12:40+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,7 +80,11 @@ msgstr "Fehler beim Schreiben auf die Festplatte"
 msgid "Not enough storage available"
 msgstr "Nicht genug Speicher vorhanden."
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
@@ -100,21 +104,20 @@ msgstr "Nicht genug Speicherplatz verfügbar"
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:234 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "Die URL darf nicht leer sein."
 
-#: js/file-upload.js:239 lib/app.php:53
+#: js/file-upload.js:244 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:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Fehler"
 
@@ -130,41 +133,57 @@ msgstr "Endgültig löschen"
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "Namen vorschlagen"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} ersetzt durch {new_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n Ordner"
+msgstr[1] "%n Ordner"
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n Datei"
+msgstr[1] "%n Dateien"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n Datei wird hochgeladen"
 msgstr[1] "%n Dateien werden hochgeladen"
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "Dateien werden hoch geladen"
 
@@ -202,34 +221,18 @@ msgid ""
 "big."
 msgstr "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten."
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Geändert"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n Ordner"
-msgstr[1] "%n Ordner"
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n Datei"
-msgstr[1] "%n Dateien"
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -333,22 +336,6 @@ msgstr "Dateien werden gescannt, bitte warten."
 msgid "Current scanning"
 msgstr "Scanne"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "Verzeichnis"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "Verzeichnisse"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "Datei"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "Dateien"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Dateisystem-Cache wird aktualisiert ..."
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index 30a80e83f7afe46870e3f7a47af64d112e2352ad..4b00901bf504707d0b958b8c826492b882ea0ee4 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -5,14 +5,15 @@
 # Translators:
 # Mario Siegmann <mario_siegmann@web.de>, 2013
 # ninov <ninovdl@ymail.com>, 2013
+# noxin <transifex.com@davidmainzer.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-30 09:33-0400\n"
+"PO-Revision-Date: 2013-08-29 11:20+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,11 +26,11 @@ msgstr ""
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "Applikation \"%s\" kann nicht installiert werden, da sie mit dieser ownCloud Version nicht kompatibel ist."
 
 #: app.php:250
 msgid "No app name specified"
-msgstr ""
+msgstr "Es wurde kein Applikation-Name angegeben"
 
 #: app.php:361
 msgid "Help"
@@ -89,59 +90,59 @@ msgstr "Lade die Dateien in kleineren, separaten, Stücken herunter oder bitte d
 
 #: installer.php:63
 msgid "No source specified when installing app"
-msgstr ""
+msgstr "Für die Installation der Applikation wurde keine Quelle angegeben"
 
 #: installer.php:70
 msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Der Link (href) wurde nicht angegeben um die Applikation per http zu installieren"
 
 #: installer.php:75
 msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Bei der Installation der Applikation aus einer lokalen Datei wurde kein Pfad angegeben"
 
 #: installer.php:89
 #, php-format
 msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Archive vom Typ %s werden nicht unterstützt"
 
 #: installer.php:103
 msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden"
 
 #: installer.php:123
 msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "Die Applikation enthält keine info,xml Datei"
 
 #: installer.php:129
 msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Die Applikation kann auf Grund von unerlaubten Code nicht installiert werden"
 
 #: installer.php:138
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
-msgstr ""
+msgstr "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist."
 
 #: installer.php:144
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
-msgstr ""
+msgstr "Die Applikation konnte nicht installiert werden, da diese das <shipped>true</shipped> Tag beinhaltet und dieses, bei nicht mitausgelieferten Applikationen, nicht erlaubt ist ist"
 
 #: installer.php:150
 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 ""
+msgstr "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist"
 
 #: installer.php:160
 msgid "App directory already exists"
-msgstr ""
+msgstr "Das Applikationsverzeichnis existiert bereits"
 
 #: installer.php:173
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Es kann kein Applikationsordner erstellt werden. Bitte passen sie die  Berechtigungen an. %s"
 
 #: json.php:28
 msgid "Application is not enabled"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index dbf98f0bf851d1c90f705bdbc3f4ab5a285a4c32..30ff6133c05a3ea522913f23580666040dbb36ff 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-30 09:33-0400\n"
+"PO-Revision-Date: 2013-08-29 11:10+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,47 +89,47 @@ msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden"
 msgid "Couldn't update app."
 msgstr "Die App konnte nicht aktualisiert werden."
 
-#: js/apps.js:35
+#: js/apps.js:43
 msgid "Update to {appversion}"
 msgstr "Aktualisiere zu {appversion}"
 
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: js/apps.js:63
+#: js/apps.js:71
 msgid "Please wait...."
 msgstr "Bitte warten..."
 
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
 msgid "Error while disabling app"
-msgstr ""
+msgstr "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten"
 
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
 msgid "Error while enabling app"
-msgstr ""
+msgstr "Beim Aktivieren der Applikation ist ein Fehler aufgetreten"
 
-#: js/apps.js:115
+#: js/apps.js:123
 msgid "Updating...."
 msgstr "Aktualisierung..."
 
-#: js/apps.js:118
+#: js/apps.js:126
 msgid "Error while updating app"
 msgstr "Fehler beim Aktualisieren der App"
 
-#: js/apps.js:118
+#: js/apps.js:126
 msgid "Error"
 msgstr "Fehler"
 
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
 msgid "Update"
 msgstr "Aktualisierung durchführen"
 
-#: js/apps.js:122
+#: js/apps.js:130
 msgid "Updated"
 msgstr "Aktualisiert"
 
diff --git a/l10n/de/user_webdavauth.po b/l10n/de/user_webdavauth.po
index b9ceaaa95d0253133b38e9a58788bff3f4081e55..cc36dab1befa8898c9c87775a8201961423bb9ff 100644
--- a/l10n/de/user_webdavauth.po
+++ b/l10n/de/user_webdavauth.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-07-29 01:56-0400\n"
-"PO-Revision-Date: 2013-07-28 16:10+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-29 20:16+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/de_AT/core.po b/l10n/de_AT/core.po
index d26af5c3d7bb504f67c63dd620aec040b5f1da20..7f813bb30cf87da86dd13709fcb119b5d961d85b 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -23,6 +23,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -194,23 +223,23 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr ""
 
@@ -443,7 +472,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr ""
 
@@ -576,10 +605,6 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Mehr Apps"
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -594,19 +619,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/de_AT/files.po b/l10n/de_AT/files.po
index 5f0e9fd18a3e249c6292acbdde149e7f2fc1c263..d3f9d2d42185af41ae79e8dc41bdeee7693bfe31 100644
--- a/l10n/de_AT/files.po
+++ b/l10n/de_AT/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -74,7 +74,11 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr ""
 
@@ -124,41 +127,57 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -196,34 +215,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -327,22 +330,6 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po
index deacb1c3c4c8b862be784439694a4c3d3f2dab34..47c4fa12e7f0fa06a5f98e81c14555b3ecc54139 100644
--- a/l10n/de_CH/core.po
+++ b/l10n/de_CH/core.po
@@ -5,6 +5,7 @@
 # Translators:
 # arkascha <foss@christian-reiner.info>, 2013
 # FlorianScholz <work@bgstyle.de>, 2013
+# FlorianScholz <work@bgstyle.de>, 2013
 # I Robot <owncloud-bot@tmit.eu>, 2013
 # Marcel Kühlhorn <susefan93@gmx.de>, 2013
 # Mario Siegmann <mario_siegmann@web.de>, 2013
@@ -15,8 +16,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:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -30,6 +31,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s teilt »%s« mit Ihnen"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Kategorie nicht angegeben."
@@ -156,14 +186,14 @@ msgstr "Gerade eben"
 #: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Vor %n Minute"
+msgstr[1] "Vor %n Minuten"
 
 #: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Vor %n Stunde"
+msgstr[1] "Vor %n Stunden"
 
 #: js/js.js:815
 msgid "today"
@@ -176,8 +206,8 @@ msgstr "Gestern"
 #: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Vor %n Tag"
+msgstr[1] "Vor %n Tagen"
 
 #: js/js.js:818
 msgid "last month"
@@ -186,8 +216,8 @@ msgstr "Letzten Monat"
 #: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Vor %n Monat"
+msgstr[1] "Vor %n Monaten"
 
 #: js/js.js:820
 msgid "months ago"
@@ -201,23 +231,23 @@ msgstr "Letztes Jahr"
 msgid "years ago"
 msgstr "Vor Jahren"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Auswählen"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten."
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Nein"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "OK"
 
@@ -384,7 +414,7 @@ msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet."
 #: lostpassword/controller.php:61
 #, php-format
 msgid "%s password reset"
-msgstr ""
+msgstr "%s-Passwort zurücksetzen"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -450,7 +480,7 @@ msgstr "Persönlich"
 msgid "Users"
 msgstr "Benutzer"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Apps"
 
@@ -583,10 +613,6 @@ msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen e
 msgid "Log out"
 msgstr "Abmelden"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Mehr Apps"
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatische Anmeldung verweigert!"
@@ -601,19 +627,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Passwort vergessen?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "merken"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Einloggen"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Alternative Logins"
 
diff --git a/l10n/de_CH/files.po b/l10n/de_CH/files.po
index 8befee513b7595dd91815fb14b962c0f835265d9..a1c58799f3385b4b1e679b43ad1d5a0c53a50119 100644
--- a/l10n/de_CH/files.po
+++ b/l10n/de_CH/files.po
@@ -5,6 +5,7 @@
 # Translators:
 # a.tangemann <a.tangemann@web.de>, 2013
 # FlorianScholz <work@bgstyle.de>, 2013
+# FlorianScholz <work@bgstyle.de>, 2013
 # I Robot <owncloud-bot@tmit.eu>, 2013
 # kabum <uu.kabum@gmail.com>, 2013
 # Marcel Kühlhorn <susefan93@gmx.de>, 2013
@@ -15,8 +16,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-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -82,7 +83,11 @@ msgstr "Fehler beim Schreiben auf die Festplatte"
 msgid "Not enough storage available"
 msgstr "Nicht genug Speicher vorhanden."
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
@@ -102,21 +107,20 @@ msgstr "Nicht genügend Speicherplatz verfügbar"
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "Die URL darf nicht leer sein."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 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:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Fehler"
 
@@ -132,41 +136,57 @@ msgstr "Endgültig löschen"
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "Namen vorschlagen"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} wurde ersetzt durch {new_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] "%n Ordner"
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] "%n Dateien"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n Datei wird hochgeladen"
+msgstr[1] "%n Dateien werden hochgeladen"
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "Dateien werden hoch geladen"
 
@@ -196,7 +216,7 @@ msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)"
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
-msgstr ""
+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:245
 msgid ""
@@ -204,34 +224,18 @@ msgid ""
 "big."
 msgstr "Ihr Download wird vorbereitet. Dies kann bei grösseren Dateien etwas dauern."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Ungültiger Verzeichnisname. Die Nutzung von «Shared» ist ownCloud vorbehalten"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Grösse"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Geändert"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -335,22 +339,6 @@ msgstr "Dateien werden gescannt, bitte warten."
 msgid "Current scanning"
 msgstr "Scanne"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "Verzeichnis"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "Verzeichnisse"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "Datei"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "Dateien"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Dateisystem-Cache wird aktualisiert ..."
diff --git a/l10n/de_CH/files_encryption.po b/l10n/de_CH/files_encryption.po
index ccf349afd9f17d213bc9998283523972f303f19a..774a24105153f864d2e897af00f9ddecb209f5b4 100644
--- a/l10n/de_CH/files_encryption.po
+++ b/l10n/de_CH/files_encryption.po
@@ -5,6 +5,7 @@
 # Translators:
 # ako84 <a0306265@unet.univie.ac.at>, 2013
 # FlorianScholz <work@bgstyle.de>, 2013
+# FlorianScholz <work@bgstyle.de>, 2013
 # JamFX <niko@nik-o-mat.de>, 2013
 # Mario Siegmann <mario_siegmann@web.de>, 2013
 # traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
@@ -12,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-19 19:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-26 08:20+0000\n"
+"Last-Translator: FlorianScholz <work@bgstyle.de>\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"
@@ -75,7 +76,7 @@ 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 ""
+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:249
 msgid "Following users are not set up for encryption:"
diff --git a/l10n/de_CH/files_trashbin.po b/l10n/de_CH/files_trashbin.po
index 1d80e2f4371bad1f5e42d4a26b49bb193d22e347..5061816a4dcccc1a649f13c72be875945e0f8cf6 100644
--- a/l10n/de_CH/files_trashbin.po
+++ b/l10n/de_CH/files_trashbin.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # FlorianScholz <work@bgstyle.de>, 2013
+# FlorianScholz <work@bgstyle.de>, 2013
 # Mario Siegmann <mario_siegmann@web.de>, 2013
 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"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-26 08:30+0000\n"
+"Last-Translator: FlorianScholz <work@bgstyle.de>\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"
@@ -56,14 +57,14 @@ msgstr "Gelöscht"
 #: js/trash.js:191
 msgid "%n folder"
 msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n Ordner"
+msgstr[1] "%n Ordner"
 
 #: js/trash.js:197
 msgid "%n file"
 msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n Datei"
+msgstr[1] "%n Dateien"
 
 #: lib/trash.php:819 lib/trash.php:821
 msgid "restored"
diff --git a/l10n/de_CH/lib.po b/l10n/de_CH/lib.po
index a63c16f5608e891d4f504f8f25885a883351d8f9..11d2f26f5a497f193b48659156954ce7c5fa618b 100644
--- a/l10n/de_CH/lib.po
+++ b/l10n/de_CH/lib.po
@@ -4,15 +4,16 @@
 # 
 # Translators:
 # FlorianScholz <work@bgstyle.de>, 2013
+# FlorianScholz <work@bgstyle.de>, 2013
 # Mario Siegmann <mario_siegmann@web.de>, 2013
 # traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-27 06:30+0000\n"
+"Last-Translator: FlorianScholz <work@bgstyle.de>\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"
@@ -25,11 +26,11 @@ msgstr ""
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "Anwendung \"%s\" kann nicht installiert werden, da sie mit dieser Version von ownCloud nicht kompatibel ist."
 
 #: app.php:250
 msgid "No app name specified"
-msgstr ""
+msgstr "Kein App-Name spezifiziert"
 
 #: app.php:361
 msgid "Help"
@@ -114,7 +115,7 @@ msgstr ""
 
 #: installer.php:129
 msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Anwendung kann wegen nicht erlaubten Codes nicht installiert werden"
 
 #: installer.php:138
 msgid ""
@@ -136,7 +137,7 @@ msgstr ""
 
 #: installer.php:160
 msgid "App directory already exists"
-msgstr ""
+msgstr "Anwendungsverzeichnis existiert bereits"
 
 #: installer.php:173
 #, php-format
@@ -275,13 +276,13 @@ msgstr "Gerade eben"
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "Vor %n Minuten"
 
 #: template/functions.php:82
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "Vor %n Stunden"
 
 #: template/functions.php:83
 msgid "today"
@@ -295,7 +296,7 @@ msgstr "Gestern"
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "Vor %n Tagen"
 
 #: template/functions.php:86
 msgid "last month"
@@ -305,7 +306,7 @@ msgstr "Letzten Monat"
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "Vor %n Monaten"
 
 #: template/functions.php:88
 msgid "last year"
diff --git a/l10n/de_CH/settings.po b/l10n/de_CH/settings.po
index c558e0cd905ab1dffc63d9e12d027c7cc52ad8c4..5e184ab89b919653e459cda0417b8abcc5a512e3 100644
--- a/l10n/de_CH/settings.po
+++ b/l10n/de_CH/settings.po
@@ -6,6 +6,7 @@
 # arkascha <foss@christian-reiner.info>, 2013
 # a.tangemann <a.tangemann@web.de>, 2013
 # FlorianScholz <work@bgstyle.de>, 2013
+# FlorianScholz <work@bgstyle.de>, 2013
 # kabum <uu.kabum@gmail.com>, 2013
 # Mario Siegmann <mario_siegmann@web.de>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
@@ -14,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-27 06:30+0000\n"
+"Last-Translator: FlorianScholz <work@bgstyle.de>\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"
@@ -109,11 +110,11 @@ msgstr "Bitte warten...."
 
 #: js/apps.js:71 js/apps.js:72 js/apps.js:92
 msgid "Error while disabling app"
-msgstr ""
+msgstr "Fehler während der Deaktivierung der Anwendung"
 
 #: js/apps.js:91 js/apps.js:104 js/apps.js:105
 msgid "Error while enabling app"
-msgstr ""
+msgstr "Fehler während der Aktivierung der Anwendung"
 
 #: js/apps.js:115
 msgid "Updating...."
@@ -137,7 +138,7 @@ msgstr "Aktualisiert"
 
 #: js/personal.js:150
 msgid "Decrypting files... Please wait, this can take some time."
-msgstr ""
+msgstr "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen."
 
 #: js/personal.js:172
 msgid "Saving..."
@@ -486,15 +487,15 @@ msgstr "Verschlüsselung"
 
 #: templates/personal.php:119
 msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr ""
+msgstr "Die Anwendung zur Verschlüsselung ist nicht länger aktiv, all Ihre Dateien werden entschlüsselt. "
 
 #: templates/personal.php:125
 msgid "Log-in password"
-msgstr ""
+msgstr "Login-Passwort"
 
 #: templates/personal.php:130
 msgid "Decrypt all Files"
-msgstr ""
+msgstr "Alle Dateien entschlüsseln"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/de_CH/user_ldap.po b/l10n/de_CH/user_ldap.po
index 9081b095a9cacadaffa1b56e2b666f48eea300dc..0267d804b6fe8c6d1c5ec8b2b726db3827ce9dd9 100644
--- a/l10n/de_CH/user_ldap.po
+++ b/l10n/de_CH/user_ldap.po
@@ -5,6 +5,7 @@
 # Translators:
 # a.tangemann <a.tangemann@web.de>, 2013
 # FlorianScholz <work@bgstyle.de>, 2013
+# FlorianScholz <work@bgstyle.de>, 2013
 # JamFX <niko@nik-o-mat.de>, 2013
 # Marcel Kühlhorn <susefan93@gmx.de>, 2013
 # Mario Siegmann <mario_siegmann@web.de>, 2013
@@ -14,9 +15,9 @@ 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"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-27 06:30+0000\n"
+"Last-Translator: FlorianScholz <work@bgstyle.de>\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"
@@ -162,7 +163,7 @@ msgstr "Benutzer-Login-Filter"
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action. Example: \"uid=%%uid\""
-msgstr ""
+msgstr "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\""
 
 #: templates/settings.php:55
 msgid "User List Filter"
@@ -172,7 +173,7 @@ msgstr "Benutzer-Filter-Liste"
 msgid ""
 "Defines the filter to apply, when retrieving users (no placeholders). "
 "Example: \"objectClass=person\""
-msgstr ""
+msgstr "Definiert den Filter für die Wiederherstellung eines Benutzers (kein Platzhalter). Beispiel: \"objectClass=person\""
 
 #: templates/settings.php:59
 msgid "Group Filter"
@@ -182,7 +183,7 @@ msgstr "Gruppen-Filter"
 msgid ""
 "Defines the filter to apply, when retrieving groups (no placeholders). "
 "Example: \"objectClass=posixGroup\""
-msgstr ""
+msgstr "Definiert den Filter für die Wiederherstellung einer Gruppe (kein Platzhalter). Beispiel: \"objectClass=posixGroup\""
 
 #: templates/settings.php:66
 msgid "Connection Settings"
@@ -243,7 +244,7 @@ msgstr "Schalten Sie die SSL-Zertifikatsprüfung aus."
 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 ""
+msgstr "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server."
 
 #: templates/settings.php:76
 msgid "Cache Time-To-Live"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index da78f8613cf7c294e5d39b8eb70222e6c9e29829..1a3f292dc076a14b27fd4abda01091c4fb003555 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -30,6 +30,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s geteilt »%s« mit Ihnen"
 
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr "Wartungsmodus eingeschaltet "
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr "Wartungsmodus ausgeschaltet"
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr "Datenbank aktualisiert"
+
+#: ajax/update.php:20
+msgid "Updating filecache, this may take really long..."
+msgstr "Aktualisiere Dateicache, dies könnte eine Weile dauern..."
+
+#: ajax/update.php:23
+msgid "Updated filecache"
+msgstr "Dateicache aktualisiert"
+
+#: ajax/update.php:26
+#, php-format
+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."
@@ -201,23 +230,23 @@ msgstr "Letztes Jahr"
 msgid "years ago"
 msgstr "Vor Jahren"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Auswählen"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten."
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Nein"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "OK"
 
@@ -450,7 +479,7 @@ msgstr "Persönlich"
 msgid "Users"
 msgstr "Benutzer"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Apps"
 
@@ -583,10 +612,6 @@ msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen e
 msgid "Log out"
 msgstr "Abmelden"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Mehr Apps"
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatische Anmeldung verweigert!"
@@ -601,19 +626,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Passwort vergessen?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "merken"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Einloggen"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Alternative Logins"
 
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 9bab6784cd67b3b5564fe59f22724ade2d61f8bb..1282d6306c9436d613c4de31e9ddee67f76a967a 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.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-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-20 06:50+0000\n"
-"Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,7 +82,11 @@ msgstr "Fehler beim Schreiben auf die Festplatte"
 msgid "Not enough storage available"
 msgstr "Nicht genug Speicher vorhanden."
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
@@ -102,21 +106,20 @@ msgstr "Nicht genügend Speicherplatz verfügbar"
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:234 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "Die URL darf nicht leer sein."
 
-#: js/file-upload.js:239 lib/app.php:53
+#: js/file-upload.js:244 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:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Fehler"
 
@@ -132,41 +135,57 @@ msgstr "Endgültig löschen"
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "Namen vorschlagen"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} wurde ersetzt durch {new_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n Ordner"
+msgstr[1] "%n Ordner"
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n Datei"
+msgstr[1] "%n Dateien"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n Datei wird hoch geladen"
 msgstr[1] "%n Dateien werden hoch geladen"
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "Dateien werden hoch geladen"
 
@@ -204,34 +223,18 @@ msgid ""
 "big."
 msgstr "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Geändert"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n Ordner"
-msgstr[1] "%n Ordner"
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n Datei"
-msgstr[1] "%n Dateien"
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -335,22 +338,6 @@ msgstr "Dateien werden gescannt, bitte warten."
 msgid "Current scanning"
 msgstr "Scanne"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "Verzeichnis"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "Verzeichnisse"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "Datei"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "Dateien"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Dateisystem-Cache wird aktualisiert ..."
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index adb12291feb5156bf2a657672726ad6220c52a20..2abd875bdd9de5e944b5825786bc4a9fb8797dbf 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-30 09:33-0400\n"
+"PO-Revision-Date: 2013-08-29 11:30+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,11 +25,11 @@ msgstr ""
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "Applikation \"%s\" kann nicht installiert werden, da sie mit dieser ownCloud Version nicht kompatibel ist."
 
 #: app.php:250
 msgid "No app name specified"
-msgstr ""
+msgstr "Es wurde kein Applikation-Name angegeben"
 
 #: app.php:361
 msgid "Help"
@@ -89,59 +89,59 @@ msgstr "Laden Sie die Dateien in kleineren, separaten, Stücken herunter oder bi
 
 #: installer.php:63
 msgid "No source specified when installing app"
-msgstr ""
+msgstr "Für die Installation der Applikation wurde keine Quelle angegeben"
 
 #: installer.php:70
 msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Der Link (href) wurde nicht angegeben um die Applikation per http zu installieren"
 
 #: installer.php:75
 msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Bei der Installation der Applikation aus einer lokalen Datei wurde kein Pfad angegeben"
 
 #: installer.php:89
 #, php-format
 msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Archive des Typs %s werden nicht unterstützt."
 
 #: installer.php:103
 msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden"
 
 #: installer.php:123
 msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "Die Applikation enthält keine info,xml Datei"
 
 #: installer.php:129
 msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Die Applikation kann auf Grund von unerlaubten Code nicht installiert werden"
 
 #: installer.php:138
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
-msgstr ""
+msgstr "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist."
 
 #: installer.php:144
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
-msgstr ""
+msgstr "Die Applikation konnte nicht installiert werden, da diese das <shipped>true</shipped> Tag beinhaltet und dieses, bei nicht mitausgelieferten Applikationen, nicht erlaubt ist ist"
 
 #: installer.php:150
 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 ""
+msgstr "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist"
 
 #: installer.php:160
 msgid "App directory already exists"
-msgstr ""
+msgstr "Der Ordner für die Anwendung existiert bereits."
 
 #: installer.php:173
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Der Ordner für die Anwendung konnte nicht angelegt werden. Bitte überprüfen Sie die Ordner- und Dateirechte und passen Sie diese entsprechend an. %s"
 
 #: json.php:28
 msgid "Application is not enabled"
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index d5bf5ec301ac176c8955896f757b03355bac365f..a2f41d584fac6131a62d289c2574950e65f72227 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -7,15 +7,16 @@
 # arkascha <foss@christian-reiner.info>, 2013
 # Mario Siegmann <mario_siegmann@web.de>, 2013
 # traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
+# noxin <transifex.com@davidmainzer.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 # kabum <uu.kabum@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-30 09:33-0400\n"
+"PO-Revision-Date: 2013-08-29 11:10+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -90,47 +91,47 @@ msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden"
 msgid "Couldn't update app."
 msgstr "Die App konnte nicht aktualisiert werden."
 
-#: js/apps.js:35
+#: js/apps.js:43
 msgid "Update to {appversion}"
 msgstr "Update zu {appversion}"
 
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: js/apps.js:63
+#: js/apps.js:71
 msgid "Please wait...."
 msgstr "Bitte warten...."
 
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
 msgid "Error while disabling app"
-msgstr ""
+msgstr "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten"
 
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
 msgid "Error while enabling app"
-msgstr ""
+msgstr "Beim Aktivieren der Applikation ist ein Fehler aufgetreten"
 
-#: js/apps.js:115
+#: js/apps.js:123
 msgid "Updating...."
 msgstr "Update..."
 
-#: js/apps.js:118
+#: js/apps.js:126
 msgid "Error while updating app"
 msgstr "Es ist ein Fehler während des Updates aufgetreten"
 
-#: js/apps.js:118
+#: js/apps.js:126
 msgid "Error"
 msgstr "Fehler"
 
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
 msgid "Update"
 msgstr "Update durchführen"
 
-#: js/apps.js:122
+#: js/apps.js:130
 msgid "Updated"
 msgstr "Aktualisiert"
 
@@ -198,7 +199,7 @@ msgid ""
 "configure your webserver in a way that the data directory is no longer "
 "accessible or you move the data directory outside the webserver document "
 "root."
-msgstr "Ihr Datenverzeichnis und Ihre Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers."
+msgstr "Ihr Datenverzeichnis und Ihre Dateien sind möglicherweise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers."
 
 #: templates/admin.php:29
 msgid "Setup Warning"
@@ -248,7 +249,7 @@ msgid ""
 "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 "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen."
+msgstr "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen nutzen wollen."
 
 #: templates/admin.php:92
 msgid "Cron"
@@ -266,7 +267,7 @@ msgstr "cron.php ist als Webcron-Dienst registriert, der die cron.php minütlich
 
 #: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
-msgstr "Benutzen Sie den System-Crondienst um die cron.php minütlich aufzurufen."
+msgstr "Benutzen Sie den System-Crondienst, um die cron.php minütlich aufzurufen."
 
 #: templates/admin.php:120
 msgid "Sharing"
@@ -290,7 +291,7 @@ msgstr "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen"
 
 #: templates/admin.php:143
 msgid "Allow public uploads"
-msgstr "Erlaube öffentliches hochladen"
+msgstr "Öffentliches Hochladen erlauben"
 
 #: templates/admin.php:144
 msgid ""
diff --git a/l10n/el/core.po b/l10n/el/core.po
index f44d16018461be1b44030677cf8d07bda040b21b..31ff37b3eeb214c2768b9a34b87f447aa8eef7ce 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -29,6 +29,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "Ο %s διαμοιράστηκε μαζί σας το »%s«"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Δεν δώθηκε τύπος κατηγορίας."
@@ -200,23 +229,23 @@ msgstr "τελευταίο χρόνο"
 msgid "years ago"
 msgstr "χρόνια πριν"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Επιλέξτε"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "Σφάλμα φόρτωσης αρχείου επιλογέα προτύπου"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Ναι"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Όχι"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Οκ"
 
@@ -449,7 +478,7 @@ msgstr "Προσωπικά"
 msgid "Users"
 msgstr "Χρήστες"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Εφαρμογές"
 
@@ -582,10 +611,6 @@ msgstr "%s είναι διαθέσιμη. Δείτε περισσότερες π
 msgid "Log out"
 msgstr "Αποσύνδεση"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Απορρίφθηκε η αυτόματη σύνδεση!"
@@ -600,19 +625,19 @@ msgstr "Εάν δεν αλλάξατε το συνθηματικό σας προ
 msgid "Please change your password to secure your account again."
 msgstr "Παρακαλώ αλλάξτε το συνθηματικό σας για να ασφαλίσετε πάλι τον λογαριασμό σας."
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Ξεχάσατε το συνθηματικό σας;"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "απομνημόνευση"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Είσοδος"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Εναλλακτικές Συνδέσεις"
 
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 33d746942714e0d9f1604bd1ec1b12e0ac936797..50dcd3f9477a8f7b0e77ea66a0b41c29385fc51e 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -5,12 +5,13 @@
 # Translators:
 # Efstathios Iosifidis <iefstathios@gmail.com>, 2013
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
+# frerisp <petrosfreris@gmail.com>, 2013
 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:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -76,7 +77,11 @@ msgstr "Αποτυχία εγγραφής στο δίσκο"
 msgid "Not enough storage available"
 msgstr "Μη επαρκής διαθέσιμος αποθηκευτικός χώρος"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Μη έγκυρος φάκελος."
 
@@ -96,21 +101,20 @@ msgstr "Δεν υπάρχει αρκετός διαθέσιμος χώρος"
 msgid "Upload cancelled."
 msgstr "Η αποστολή ακυρώθηκε."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή."
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "Η URL δεν μπορεί να είναι κενή."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από το ownCloud"
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -126,41 +130,57 @@ msgstr "Μόνιμη διαγραφή"
 msgid "Rename"
 msgstr "Μετονομασία"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Εκκρεμεί"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} υπάρχει ήδη"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "αντικατέστησε"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "συνιστώμενο όνομα"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "ακύρωση"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "αντικαταστάθηκε το {new_name} με {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "αναίρεση"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n φάκελος"
+msgstr[1] "%n φάκελοι"
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n αρχείο"
+msgstr[1] "%n αρχεία"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ανέβασμα %n αρχείου"
+msgstr[1] "Ανέβασμα %n αρχείων"
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "αρχεία ανεβαίνουν"
 
@@ -190,7 +210,7 @@ msgstr "Ο αποθηκευτικός χώρος είναι σχεδόν γεμ
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
-msgstr ""
+msgstr "Η κρυπτογράφηση απενεργοποιήθηκε, αλλά τα αρχεία σας είναι ακόμα κρυπτογραφημένα. Παρακαλούμε απενεργοποιήσετε την κρυπτογράφηση αρχείων από τις προσωπικές σας ρυθμίσεις"
 
 #: js/files.js:245
 msgid ""
@@ -198,34 +218,18 @@ msgid ""
 "big."
 msgstr "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από ο Owncloud"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Όνομα"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Τροποποιήθηκε"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -329,22 +333,6 @@ msgstr "Τα αρχεία σαρώνονται, παρακαλώ περιμέν
 msgid "Current scanning"
 msgstr "Τρέχουσα ανίχνευση"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "κατάλογος"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "κατάλογοι"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "αρχείο"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "αρχεία"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Ενημέρωση της μνήμης cache του συστήματος αρχείων..."
diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po
index 9419e249a1fb5b6145bf3667cdbd4d3a3300965b..d1043567c1beb64b0882c18823622f558407997c 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-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 09:00+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,43 +28,43 @@ msgstr "Αδύνατη η μόνιμη διαγραφή του %s"
 msgid "Couldn't restore %s"
 msgstr "Αδυναμία επαναφοράς %s"
 
-#: js/trash.js:7 js/trash.js:100
+#: js/trash.js:7 js/trash.js:102
 msgid "perform restore operation"
 msgstr "εκτέλεση λειτουργία επαναφοράς"
 
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: js/trash.js:36
+#: js/trash.js:37
 msgid "delete file permanently"
 msgstr "μόνιμη διαγραφή αρχείου"
 
-#: js/trash.js:127
+#: js/trash.js:129
 msgid "Delete permanently"
 msgstr "Μόνιμη διαγραφή"
 
-#: js/trash.js:182 templates/index.php:17
+#: js/trash.js:184 templates/index.php:17
 msgid "Name"
 msgstr "Όνομα"
 
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:185 templates/index.php:27
 msgid "Deleted"
 msgstr "Διαγράφηκε"
 
-#: js/trash.js:191
+#: js/trash.js:193
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n φάκελοι"
 
-#: js/trash.js:197
+#: js/trash.js:199
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n αρχεία"
 
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trash.php:814 lib/trash.php:816
 msgid "restored"
 msgstr "έγινε επαναφορά"
 
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index 3def6859364742bbf73cdad5735953e1795781be..8bc849cef431f913391c0b40736fdac0c01fb2d0 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -23,6 +23,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -194,23 +223,23 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr ""
 
@@ -443,7 +472,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr ""
 
@@ -576,10 +605,6 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -594,19 +619,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/en@pirate/files.po b/l10n/en@pirate/files.po
index 8d37893029d302abe6cce4b6bb1735fa67a1027b..5874adaf38d3cbeada65f1a1eea1e9e889a2b9b3 100644
--- a/l10n/en@pirate/files.po
+++ b/l10n/en@pirate/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -74,7 +74,11 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr ""
 
@@ -124,41 +127,57 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -196,34 +215,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -327,22 +330,6 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/en_GB/core.po
similarity index 61%
rename from l10n/zh_CN.GB2312/core.po
rename to l10n/en_GB/core.po
index 21e175e4ff68c41082ca06894c97b4f0d9f354ee..26e1f3c14a9f092cee6a8ace5b2e4ad88ceff10e 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/en_GB/core.po
@@ -3,220 +3,250 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# aivier <iaivier@126.com>, 2013
-# fkj <fengkaijia@gmail.com>, 2013
-# Martin Liu <liuzh66@gmail.com>, 2013
-# hyy0591 <yangyu.huang@gmail.com>, 2013
+# mnestis <transifex@mnestis.net>, 2013
 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:06+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN.GB2312\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr "%s 与您共享了 »%s« "
+msgstr "%s shared \"%s\" with you"
+
+#: ajax/share.php:227
+msgid "group"
+msgstr "group"
+
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr "Turned on maintenance mode"
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr "Turned off maintenance mode"
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr "Updated database"
+
+#: ajax/update.php:20
+msgid "Updating filecache, this may take really long..."
+msgstr "Updating filecache, this may take a really long time..."
+
+#: ajax/update.php:23
+msgid "Updated filecache"
+msgstr "Updated filecache"
+
+#: ajax/update.php:26
+#, php-format
+msgid "... %d%% done ..."
+msgstr "... %d%% done ..."
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
-msgstr "未选择分类类型。"
+msgstr "Category type not provided."
 
 #: ajax/vcategories/add.php:30
 msgid "No category to add?"
-msgstr "没有分类添加了?"
+msgstr "No category to add?"
 
 #: ajax/vcategories/add.php:37
 #, php-format
 msgid "This category already exists: %s"
-msgstr "此分类已存在：%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 "未选择对象类型。"
+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"
+msgstr "%s ID not provided."
 
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
 msgid "Error adding %s to favorites."
-msgstr "在添加 %s 到收藏夹时发生错误。"
+msgstr "Error adding %s to favourites."
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
-msgstr "没有选中要删除的分类。"
+msgstr "No categories selected for deletion."
 
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr "在移除收藏夹中的 %s 时发生错误。"
+msgstr "Error removing %s from favourites."
 
 #: js/config.php:32
 msgid "Sunday"
-msgstr "星期天"
+msgstr "Sunday"
 
 #: js/config.php:33
 msgid "Monday"
-msgstr "星期一"
+msgstr "Monday"
 
 #: js/config.php:34
 msgid "Tuesday"
-msgstr "星期二"
+msgstr "Tuesday"
 
 #: js/config.php:35
 msgid "Wednesday"
-msgstr "星期三"
+msgstr "Wednesday"
 
 #: js/config.php:36
 msgid "Thursday"
-msgstr "星期四"
+msgstr "Thursday"
 
 #: js/config.php:37
 msgid "Friday"
-msgstr "星期五"
+msgstr "Friday"
 
 #: js/config.php:38
 msgid "Saturday"
-msgstr "星期六"
+msgstr "Saturday"
 
 #: js/config.php:43
 msgid "January"
-msgstr "一月"
+msgstr "January"
 
 #: js/config.php:44
 msgid "February"
-msgstr "二月"
+msgstr "February"
 
 #: js/config.php:45
 msgid "March"
-msgstr "三月"
+msgstr "March"
 
 #: js/config.php:46
 msgid "April"
-msgstr "四月"
+msgstr "April"
 
 #: js/config.php:47
 msgid "May"
-msgstr "五月"
+msgstr "May"
 
 #: js/config.php:48
 msgid "June"
-msgstr "六月"
+msgstr "June"
 
 #: js/config.php:49
 msgid "July"
-msgstr "七月"
+msgstr "July"
 
 #: js/config.php:50
 msgid "August"
-msgstr "八月"
+msgstr "August"
 
 #: js/config.php:51
 msgid "September"
-msgstr "九月"
+msgstr "September"
 
 #: js/config.php:52
 msgid "October"
-msgstr "十月"
+msgstr "October"
 
 #: js/config.php:53
 msgid "November"
-msgstr "十一月"
+msgstr "November"
 
 #: js/config.php:54
 msgid "December"
-msgstr "十二月"
+msgstr "December"
 
 #: js/js.js:355
 msgid "Settings"
-msgstr "设置"
+msgstr "Settings"
 
 #: js/js.js:812
 msgid "seconds ago"
-msgstr "秒前"
+msgstr "seconds ago"
 
 #: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] "%n 分钟以前"
+msgstr[0] "%n minute ago"
+msgstr[1] "%n minutes ago"
 
 #: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] "%n 小时以前"
+msgstr[0] "%n hour ago"
+msgstr[1] "%n hours ago"
 
 #: js/js.js:815
 msgid "today"
-msgstr "今天"
+msgstr "today"
 
 #: js/js.js:816
 msgid "yesterday"
-msgstr "昨天"
+msgstr "yesterday"
 
 #: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
-msgstr[0] "%n 天以前"
+msgstr[0] "%n day ago"
+msgstr[1] "%n days ago"
 
 #: js/js.js:818
 msgid "last month"
-msgstr "上个月"
+msgstr "last month"
 
 #: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] "%n 个月以前"
+msgstr[0] "%n month ago"
+msgstr[1] "%n months ago"
 
 #: js/js.js:820
 msgid "months ago"
-msgstr "月前"
+msgstr "months ago"
 
 #: js/js.js:821
 msgid "last year"
-msgstr "去年"
+msgstr "last year"
 
 #: js/js.js:822
 msgid "years ago"
-msgstr "年前"
+msgstr "years ago"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
-msgstr "选择"
+msgstr "Choose"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
-msgstr "加载文件选取模板出错"
+msgstr "Error loading file picker template"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
-msgstr "是"
+msgstr "Yes"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
-msgstr "否"
+msgstr "No"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
-msgstr "好的"
+msgstr "OK"
 
 #: 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 "未指定对象类型。"
+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
@@ -224,183 +254,183 @@ msgstr "未指定对象类型。"
 #: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
 #: js/share.js:643 js/share.js:655
 msgid "Error"
-msgstr "出错"
+msgstr "Error"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
-msgstr "未指定应用名称。"
+msgstr "The app name is not specified."
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
-msgstr "未安装所需要的文件 {file} ！"
+msgstr "The required file {file} is not installed!"
 
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
-msgstr "已分享"
+msgstr "Shared"
 
 #: js/share.js:90
 msgid "Share"
-msgstr "分享"
+msgstr "Share"
 
 #: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
-msgstr "分享出错"
+msgstr "Error whilst sharing"
 
 #: js/share.js:142
 msgid "Error while unsharing"
-msgstr "取消分享出错"
+msgstr "Error whilst unsharing"
 
 #: js/share.js:149
 msgid "Error while changing permissions"
-msgstr "变更权限出错"
+msgstr "Error whilst changing permissions"
 
 #: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
-msgstr "由 {owner} 与您和 {group} 群组分享"
+msgstr "Shared with you and the group {group} by {owner}"
 
 #: js/share.js:160
 msgid "Shared with you by {owner}"
-msgstr "由 {owner} 与您分享"
+msgstr "Shared with you by {owner}"
 
 #: js/share.js:183
 msgid "Share with"
-msgstr "分享"
+msgstr "Share with"
 
 #: js/share.js:188
 msgid "Share with link"
-msgstr "分享链接"
+msgstr "Share with link"
 
 #: js/share.js:191
 msgid "Password protect"
-msgstr "密码保护"
+msgstr "Password protect"
 
 #: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
-msgstr "密码"
+msgstr "Password"
 
 #: js/share.js:198
 msgid "Allow Public Upload"
-msgstr "允许公众上传"
+msgstr "Allow Public Upload"
 
 #: js/share.js:202
 msgid "Email link to person"
-msgstr "面向个人的电子邮件链接"
+msgstr "Email link to person"
 
 #: js/share.js:203
 msgid "Send"
-msgstr "发送"
+msgstr "Send"
 
 #: js/share.js:208
 msgid "Set expiration date"
-msgstr "设置失效日期"
+msgstr "Set expiration date"
 
 #: js/share.js:209
 msgid "Expiration date"
-msgstr "失效日期"
+msgstr "Expiration date"
 
 #: js/share.js:241
 msgid "Share via email:"
-msgstr "通过电子邮件分享："
+msgstr "Share via email:"
 
 #: js/share.js:243
 msgid "No people found"
-msgstr "查无此人"
+msgstr "No people found"
 
 #: js/share.js:281
 msgid "Resharing is not allowed"
-msgstr "不允许重复分享"
+msgstr "Resharing is not allowed"
 
 #: js/share.js:317
 msgid "Shared in {item} with {user}"
-msgstr "已经与 {user} 在 {item} 中分享"
+msgstr "Shared in {item} with {user}"
 
 #: js/share.js:338
 msgid "Unshare"
-msgstr "取消分享"
+msgstr "Unshare"
 
 #: js/share.js:350
 msgid "can edit"
-msgstr "可编辑"
+msgstr "can edit"
 
 #: js/share.js:352
 msgid "access control"
-msgstr "访问控制"
+msgstr "access control"
 
 #: js/share.js:355
 msgid "create"
-msgstr "创建"
+msgstr "create"
 
 #: js/share.js:358
 msgid "update"
-msgstr "æ›´æ–°"
+msgstr "update"
 
 #: js/share.js:361
 msgid "delete"
-msgstr "删除"
+msgstr "delete"
 
 #: js/share.js:364
 msgid "share"
-msgstr "分享"
+msgstr "share"
 
 #: js/share.js:398 js/share.js:630
 msgid "Password protected"
-msgstr "密码保护"
+msgstr "Password protected"
 
 #: js/share.js:643
 msgid "Error unsetting expiration date"
-msgstr "取消设置失效日期出错"
+msgstr "Error unsetting expiration date"
 
 #: js/share.js:655
 msgid "Error setting expiration date"
-msgstr "设置失效日期出错"
+msgstr "Error setting expiration date"
 
 #: js/share.js:670
 msgid "Sending ..."
-msgstr "发送中……"
+msgstr "Sending ..."
 
 #: js/share.js:681
 msgid "Email sent"
-msgstr "电子邮件已发送"
+msgstr "Email sent"
 
 #: 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 "升级失败。请向<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud社区</a>报告此问题。"
+msgstr "The update was unsuccessful. Please report this issue to the <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 "升级成功。现在为您跳转到ownCloud。"
+msgstr "The update was successful. Redirecting you to ownCloud now."
 
 #: lostpassword/controller.php:61
 #, php-format
 msgid "%s password reset"
-msgstr "%s 密码重置"
+msgstr "%s password reset"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
-msgstr "使用下面的链接来重置你的密码:{link}"
+msgstr "Use the following link to reset your password: {link}"
 
 #: 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 "重置密码的连接已经通过邮件到您的邮箱。<br> 如果你没有收到邮件，可能是由于要再等一下，或者检查一下您的垃圾邮件夹。<br> 如果还是没有收到，请联系您的系统管理员。"
+msgstr "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 ."
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "请求失败！<br> 你确定你的邮件地址/用户名是正确的？"
+msgstr "Request failed!<br>Did you make sure your email/username was correct?"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
-msgstr "你将会收到一个重置密码的链接"
+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
 msgid "Username"
-msgstr "用户名"
+msgstr "Username"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
@@ -408,59 +438,59 @@ msgid ""
 "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 "您的文件是加密的。如果您还没有启用恢复密钥，在重置了密码后，您的数据讲无法恢复回来。如果您不确定是否这么做，请联系您的管理员在继续这个操作。你却是想继续么？"
+msgstr "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?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr "是的，我想现在重置密码。"
+msgstr "Yes, I really want to reset my password now"
 
 #: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
-msgstr "要求重置"
+msgstr "Request reset"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr "你的密码已经被重置了"
+msgstr "Your password was reset"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr "转至登陆页面"
+msgstr "To login page"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr "新密码"
+msgstr "New password"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
-msgstr "重置密码"
+msgstr "Reset password"
 
 #: strings.php:5
 msgid "Personal"
-msgstr "私人"
+msgstr "Personal"
 
 #: strings.php:6
 msgid "Users"
-msgstr "用户"
+msgstr "Users"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
-msgstr "程序"
+msgstr "Apps"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "管理员"
+msgstr "Admin"
 
 #: strings.php:9
 msgid "Help"
-msgstr "帮助"
+msgstr "Help"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr "禁止访问"
+msgstr "Access denied"
 
 #: templates/404.php:15
 msgid "Cloud not found"
-msgstr "云 没有被找到"
+msgstr "Cloud not found"
 
 #: templates/altmail.php:2
 #, php-format
@@ -471,152 +501,148 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr "你好！⏎\n⏎\n温馨提示： %s 与您共享了 %s 。⏎\n查看： %s⏎\n⏎\n祝顺利！"
+msgstr "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr "编辑分类"
+msgstr "Edit categories"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
-msgstr "添加"
+msgstr "Add"
 
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
-msgstr "安全警告"
+msgstr "Security Warning"
 
 #: templates/installation.php:25
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr "您的PHP版本是会受到NULL字节漏洞攻击的(CVE-2006-7243)"
+msgstr "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 
 #: templates/installation.php:26
 #, php-format
 msgid "Please update your PHP installation to use %s securely."
-msgstr "请安全地升级您的PHP版本到 %s 。"
+msgstr "Please update your PHP installation to use %s securely."
 
 #: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr "没有安全随机码生成器，请启用 PHP OpenSSL 扩展。"
+msgstr "No secure random number generator is available, please enable the PHP OpenSSL extension."
 
 #: 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 "没有安全随机码生成器，黑客可以预测密码重置令牌并接管你的账户。"
+msgstr "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account."
 
 #: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr "因为.htaccess文件无效，您的数据文件夹及文件可能可以在互联网上访问。"
+msgstr "Your data directory and files are probably accessible from the internet because the .htaccess file does not work."
 
 #: 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 "有关如何正确地配置您的服务器，请查看 <a href=\"%s\" target=\"_blank\">文档</a>。"
+msgstr "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>."
 
 #: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
-msgstr "建立一个 <strong>管理帐户</strong>"
+msgstr "Create an <strong>admin account</strong>"
 
 #: templates/installation.php:65
 msgid "Advanced"
-msgstr "进阶"
+msgstr "Advanced"
 
 #: templates/installation.php:67
 msgid "Data folder"
-msgstr "数据存放文件夹"
+msgstr "Data folder"
 
 #: templates/installation.php:77
 msgid "Configure the database"
-msgstr "配置数据库"
+msgstr "Configure the database"
 
 #: templates/installation.php:82 templates/installation.php:94
 #: templates/installation.php:105 templates/installation.php:116
 #: templates/installation.php:128
 msgid "will be used"
-msgstr "将会使用"
+msgstr "will be used"
 
 #: templates/installation.php:140
 msgid "Database user"
-msgstr "数据库用户"
+msgstr "Database user"
 
 #: templates/installation.php:147
 msgid "Database password"
-msgstr "数据库密码"
+msgstr "Database password"
 
 #: templates/installation.php:152
 msgid "Database name"
-msgstr "数据库用户名"
+msgstr "Database name"
 
 #: templates/installation.php:160
 msgid "Database tablespace"
-msgstr "数据库表格空间"
+msgstr "Database tablespace"
 
 #: templates/installation.php:167
 msgid "Database host"
-msgstr "数据库主机"
+msgstr "Database host"
 
 #: templates/installation.php:175
 msgid "Finish setup"
-msgstr "完成安装"
+msgstr "Finish setup"
 
 #: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr "%s 是可用的。获取更多关于升级的信息。"
+msgstr "%s is available. Get more information on how to update."
 
 #: templates/layout.user.php:66
 msgid "Log out"
-msgstr "注销"
-
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "更多应用"
+msgstr "Log out"
 
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
-msgstr "自动登录被拒绝！"
+msgstr "Automatic logon rejected!"
 
 #: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr "如果您最近没有修改您的密码，那您的帐号可能被攻击了！"
+msgstr "If you did not change your password recently, your account may be compromised!"
 
 #: templates/login.php:12
 msgid "Please change your password to secure your account again."
-msgstr "请修改您的密码以保护账户。"
+msgstr "Please change your password to secure your account again."
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
-msgstr "忘记密码?"
+msgstr "Lost your password?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
-msgstr "记住登录"
+msgstr "remember"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
-msgstr "登陆"
+msgstr "Log in"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
-msgstr "备选登录"
+msgstr "Alternative Logins"
 
 #: 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>Cheers!"
-msgstr "你好！<br><br>温馨提示： %s 与您共享了 %s 。<br><br>\n查看： %s <br><br> 祝顺利！"
+msgstr "Hey there,<br><br>just letting you know that %s shared \"%s\" with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!"
 
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "ownCloud正在升级至 %s 版，这可能需要一点时间。"
+msgstr "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/en_GB/files.po
similarity index 53%
rename from l10n/zh_CN.GB2312/files.po
rename to l10n/en_GB/files.po
index b7c7892b60b2587152044258f3a427716fd8fe4e..04300969e06d5239f54cee56e968338c56524bd4 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/en_GB/files.po
@@ -3,345 +3,334 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# aivier <iaivier@126.com>, 2013
-# hlx98007 <hlx98007@gmail.com>, 2013
+# mnestis <transifex@mnestis.net>, 2013
 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"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN.GB2312\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: en_GB\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 "无法移动 %s - 存在同名文件"
+msgstr "Could not move %s - File with this name already exists"
 
 #: ajax/move.php:27 ajax/move.php:30
 #, php-format
 msgid "Could not move %s"
-msgstr "无法移动 %s"
+msgstr "Could not move %s"
 
 #: ajax/upload.php:16 ajax/upload.php:45
 msgid "Unable to set upload directory."
-msgstr "无法设置上传文件夹"
+msgstr "Unable to set upload directory."
 
 #: ajax/upload.php:22
 msgid "Invalid Token"
-msgstr "非法Token"
+msgstr "Invalid Token"
 
 #: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
-msgstr "没有上传文件。未知错误"
+msgstr "No file was uploaded. Unknown error"
 
 #: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
-msgstr "文件上传成功"
+msgstr "There is no error, the file uploaded successfully"
 
 #: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "上传的文件超过了php.ini指定的upload_max_filesize"
+msgstr "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 
 #: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "上传的文件超过了 HTML 表格中指定的 MAX_FILE_SIZE 选项"
+msgstr "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 
 #: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
-msgstr "文件部分上传"
+msgstr "The uploaded file was only partially uploaded"
 
 #: ajax/upload.php:71
 msgid "No file was uploaded"
-msgstr "没有上传文件"
+msgstr "No file was uploaded"
 
 #: ajax/upload.php:72
 msgid "Missing a temporary folder"
-msgstr "缺失临时文件夹"
+msgstr "Missing a temporary folder"
 
 #: ajax/upload.php:73
 msgid "Failed to write to disk"
-msgstr "写磁盘失败"
+msgstr "Failed to write to disk"
 
 #: ajax/upload.php:91
 msgid "Not enough storage available"
-msgstr "容量不足"
+msgstr "Not enough storage available"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr "Upload failed"
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
-msgstr "无效文件夹"
+msgstr "Invalid directory."
 
 #: appinfo/app.php:12
 msgid "Files"
-msgstr "文件"
+msgstr "Files"
 
 #: js/file-upload.js:11
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "不能上传您的文件，由于它是文件夹或者为空文件"
+msgstr "Unable to upload your file as it is a directory or has 0 bytes"
 
 #: js/file-upload.js:24
 msgid "Not enough space available"
-msgstr "容量不足"
+msgstr "Not enough space available"
 
 #: js/file-upload.js:64
 msgid "Upload cancelled."
-msgstr "上传取消了"
+msgstr "Upload cancelled."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "文件正在上传。关闭页面会取消上传。"
+msgstr "File upload is in progress. Leaving the page now will cancel the upload."
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
-msgstr "网址不能为空。"
+msgstr "URL cannot be empty."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "无效文件夹名。“Shared”已经被系统保留。"
+msgstr "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
-msgstr "出错"
+msgstr "Error"
 
 #: js/fileactions.js:116
 msgid "Share"
-msgstr "分享"
+msgstr "Share"
 
 #: js/fileactions.js:126
 msgid "Delete permanently"
-msgstr "永久删除"
+msgstr "Delete permanently"
 
 #: js/fileactions.js:192
 msgid "Rename"
-msgstr "重命名"
+msgstr "Rename"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
-msgstr "等待中"
+msgstr "Pending"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
-msgstr "{new_name} 已存在"
+msgstr "{new_name} already exists"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
-msgstr "替换"
+msgstr "replace"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
-msgstr "推荐名称"
+msgstr "suggest name"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
-msgstr "取消"
+msgstr "cancel"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
-msgstr "已用 {old_name} 替换 {new_name}"
+msgstr "replaced {new_name} with {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
-msgstr "撤销"
+msgstr "undo"
+
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n folder"
+msgstr[1] "%n folders"
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n file"
+msgstr[1] "%n files"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr "{dirs} and {files}"
 
-#: js/filelist.js:453
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
-msgstr[0] "正在上传 %n 个文件"
+msgstr[0] "Uploading %n file"
+msgstr[1] "Uploading %n files"
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
-msgstr "个文件正在上传"
+msgstr "files uploading"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr "'.' 文件名不正确"
+msgstr "'.' is an invalid file name."
 
 #: js/files.js:56
 msgid "File name cannot be empty."
-msgstr "文件名不能为空"
+msgstr "File name cannot be empty."
 
 #: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
-msgstr "文件名内不能包含以下符号：\\ / < > : \" | ?和 *"
+msgstr "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr "容量已满，不能再同步/上传文件了！"
+msgstr "Your storage is full, files can not be updated or synced anymore!"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr "你的空间快用满了 ({usedSpacePercent}%)"
+msgstr "Your storage is almost full ({usedSpacePercent}%)"
 
 #: js/files.js:94
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
-msgstr ""
+msgstr "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files."
 
 #: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr "正在下载，可能会花点时间，跟文件大小有关"
-
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "不正确文件夹名。Shared是保留名，不能使用。"
+msgstr "Your download is being prepared. This might take some time if the files are big."
 
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
-msgstr "名称"
+msgstr "Name"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
-msgstr "大小"
+msgstr "Size"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
-msgstr "修改日期"
-
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n 个文件夹"
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n 个文件"
+msgstr "Modified"
 
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
-msgstr "不能重命名 %s"
+msgstr "%s could not be renamed"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
-msgstr "上传"
+msgstr "Upload"
 
 #: templates/admin.php:5
 msgid "File handling"
-msgstr "文件处理中"
+msgstr "File handling"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
-msgstr "最大上传大小"
+msgstr "Maximum upload size"
 
 #: templates/admin.php:10
 msgid "max. possible: "
-msgstr "最大可能"
+msgstr "max. possible: "
 
 #: templates/admin.php:15
 msgid "Needed for multi-file and folder downloads."
-msgstr "需要多文件和文件夹下载."
+msgstr "Needed for multi-file and folder downloads."
 
 #: templates/admin.php:17
 msgid "Enable ZIP-download"
-msgstr "支持ZIP下载"
+msgstr "Enable ZIP-download"
 
 #: templates/admin.php:20
 msgid "0 is unlimited"
-msgstr "0是无限的"
+msgstr "0 is unlimited"
 
 #: templates/admin.php:22
 msgid "Maximum input size for ZIP files"
-msgstr "最大的ZIP文件输入大小"
+msgstr "Maximum input size for ZIP files"
 
 #: templates/admin.php:26
 msgid "Save"
-msgstr "保存"
+msgstr "Save"
 
 #: templates/index.php:7
 msgid "New"
-msgstr "新建"
+msgstr "New"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr "文本文档"
+msgstr "Text file"
 
 #: templates/index.php:12
 msgid "Folder"
-msgstr "文件夹"
+msgstr "Folder"
 
 #: templates/index.php:14
 msgid "From link"
-msgstr "来自链接"
+msgstr "From link"
 
 #: templates/index.php:41
 msgid "Deleted files"
-msgstr "已删除的文件"
+msgstr "Deleted files"
 
 #: templates/index.php:46
 msgid "Cancel upload"
-msgstr "取消上传"
+msgstr "Cancel upload"
 
 #: templates/index.php:52
 msgid "You don’t have write permissions here."
-msgstr "您没有写入权限。"
+msgstr "You don’t have write permission here."
 
 #: templates/index.php:59
 msgid "Nothing in here. Upload something!"
-msgstr "这里没有东西.上传点什么!"
+msgstr "Nothing in here. Upload something!"
 
 #: templates/index.php:73
 msgid "Download"
-msgstr "下载"
+msgstr "Download"
 
 #: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
-msgstr "取消分享"
+msgstr "Unshare"
 
 #: templates/index.php:91 templates/index.php:92
 msgid "Delete"
-msgstr "删除"
+msgstr "Delete"
 
 #: templates/index.php:105
 msgid "Upload too large"
-msgstr "上传过大"
+msgstr "Upload too large"
 
 #: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr "你正在试图上传的文件超过了此服务器支持的最大的文件大小."
+msgstr "The files you are trying to upload exceed the maximum size for file uploads on this server."
 
 #: templates/index.php:112
 msgid "Files are being scanned, please wait."
-msgstr "正在扫描文件,请稍候."
+msgstr "Files are being scanned, please wait."
 
 #: templates/index.php:115
 msgid "Current scanning"
-msgstr "正在扫描"
-
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "文件夹"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "文件夹"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "文件"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "文件"
+msgstr "Current scanning"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr "升级系统缓存..."
+msgstr "Upgrading filesystem cache..."
diff --git a/l10n/zh_CN.GB2312/files_encryption.po b/l10n/en_GB/files_encryption.po
similarity index 60%
rename from l10n/zh_CN.GB2312/files_encryption.po
rename to l10n/en_GB/files_encryption.po
index 5d2f51942f617525a08107a48c278bf08b1834a8..b81a0ff62ab101b9efc856a30303e05adff98848 100644
--- a/l10n/zh_CN.GB2312/files_encryption.po
+++ b/l10n/en_GB/files_encryption.po
@@ -3,55 +3,56 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# mnestis <transifex@mnestis.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-19 19:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-29 16:50+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"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN.GB2312\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Recovery key enabled successfully"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Could not enable recovery key. Please check your recovery key password!"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Recovery key disabled successfully"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Could not disable recovery key. Please check your recovery key password!"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Password changed successfully."
 
 #: ajax/changeRecoveryPassword.php:51
 msgid "Could not change the password. Maybe the old password was not correct."
-msgstr ""
+msgstr "Could not change the password. Maybe the old password was incorrect."
 
 #: ajax/updatePrivateKeyPassword.php:51
 msgid "Private key password successfully updated."
-msgstr ""
+msgstr "Private key password updated successfully."
 
 #: ajax/updatePrivateKeyPassword.php:53
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr ""
+msgstr "Could not update the private key password. Maybe the old password was not correct."
 
 #: files/error.php:7
 msgid ""
@@ -59,118 +60,118 @@ msgid ""
 "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 ""
+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."
 
 #: hooks/hooks.php:41
 msgid "Missing requirements."
-msgstr ""
+msgstr "Missing requirements."
 
 #: hooks/hooks.php:42
 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 ""
+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:249
 msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Following users are not set up for encryption:"
 
 #: js/settings-admin.js:11
 msgid "Saving..."
-msgstr "保存中..."
+msgstr "Saving..."
 
 #: templates/invalid_private_key.php:5
 msgid ""
 "Your private key is not valid! Maybe the your password was changed from "
 "outside."
-msgstr ""
+msgstr "Your private key is not valid! Maybe the your password was changed externally."
 
 #: templates/invalid_private_key.php:7
 msgid "You can unlock your private key in your "
-msgstr ""
+msgstr "You can unlock your private key in your "
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
-msgstr ""
+msgstr "personal settings"
 
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
-msgstr "加密"
+msgstr "Encryption"
 
 #: templates/settings-admin.php:10
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
-msgstr ""
+msgstr "Enable recovery key (allow to recover users files in case of password loss):"
 
 #: templates/settings-admin.php:14
 msgid "Recovery key password"
-msgstr ""
+msgstr "Recovery key password"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
-msgstr ""
+msgstr "Enabled"
 
 #: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
-msgstr ""
+msgstr "Disabled"
 
 #: templates/settings-admin.php:34
 msgid "Change recovery key password:"
-msgstr ""
+msgstr "Change recovery key password:"
 
 #: templates/settings-admin.php:41
 msgid "Old Recovery key password"
-msgstr ""
+msgstr "Old Recovery key password"
 
 #: templates/settings-admin.php:48
 msgid "New Recovery key password"
-msgstr ""
+msgstr "New Recovery key password"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
-msgstr ""
+msgstr "Change Password"
 
 #: templates/settings-personal.php:11
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Your private key password no longer match your login password:"
 
 #: templates/settings-personal.php:14
 msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "Set your old private key password to your current login password."
 
 #: templates/settings-personal.php:16
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
-msgstr ""
+msgstr " If you don't remember your old password you can ask your administrator to recover your files."
 
 #: templates/settings-personal.php:24
 msgid "Old log-in password"
-msgstr ""
+msgstr "Old login password"
 
 #: templates/settings-personal.php:30
 msgid "Current log-in password"
-msgstr ""
+msgstr "Current login password"
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
-msgstr ""
+msgstr "Update Private Key Password"
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
-msgstr ""
+msgstr "Enable password recovery:"
 
 #: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr ""
+msgstr "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss"
 
 #: templates/settings-personal.php:63
 msgid "File recovery settings updated"
-msgstr ""
+msgstr "File recovery settings updated"
 
 #: templates/settings-personal.php:64
 msgid "Could not update file recovery"
-msgstr ""
+msgstr "Could not update file recovery"
diff --git a/l10n/zh_CN.GB2312/files_external.po b/l10n/en_GB/files_external.po
similarity index 57%
rename from l10n/zh_CN.GB2312/files_external.po
rename to l10n/en_GB/files_external.po
index b9c2d6f3ae66aa5fecc674add200f57c2b2ab740..fc51da0a011fd65d0441e173e6d697807bc54116 100644
--- a/l10n/zh_CN.GB2312/files_external.po
+++ b/l10n/en_GB/files_external.po
@@ -3,122 +3,122 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# hyy0591 <yangyu.huang@gmail.com>, 2013
+# mnestis <transifex@mnestis.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-23 01:55-0400\n"
-"PO-Revision-Date: 2013-07-23 05:05+0000\n"
-"Last-Translator: hyy0591 <yangyu.huang@gmail.com>\n"
-"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-29 17:00+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"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN.GB2312\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
+#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
 msgid "Access granted"
-msgstr "已授予权限"
+msgstr "Access granted"
 
 #: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
 msgid "Error configuring Dropbox storage"
-msgstr "配置 Dropbox 存储出错"
+msgstr "Error configuring Dropbox storage"
 
-#: js/dropbox.js:65 js/google.js:66
+#: js/dropbox.js:65 js/google.js:86
 msgid "Grant access"
-msgstr "授予权限"
+msgstr "Grant access"
 
 #: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
-msgstr "请提供一个有效的 Dropbox app key 和 secret。"
+msgstr "Please provide a valid Dropbox app key and secret."
 
-#: js/google.js:36 js/google.js:93
+#: js/google.js:42 js/google.js:121
 msgid "Error configuring Google Drive storage"
-msgstr "配置 Google Drive 存储失败"
+msgstr "Error configuring Google Drive storage"
 
-#: lib/config.php:447
+#: 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 "<b>注意：</b>“SMB客户端”未安装。CIFS/SMB分享不可用。请向您的系统管理员请求安装该客户端。"
+msgstr "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it."
 
-#: lib/config.php:450
+#: 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 "<b>注意：</b>PHP的FTP支持尚未启用或未安装。FTP分享不可用。请向您的系统管理员请求安装。"
+msgstr "<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."
 
-#: lib/config.php:453
+#: 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 "<b>警告：</b> PHP 的 Curl 支持没有安装或打开。挂载 ownCloud、WebDAV 或 Google Drive 的功能将不可用。请询问您的系统管理员去安装它。"
+msgstr "<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."
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr "外部存储"
+msgstr "External Storage"
 
 #: templates/settings.php:9 templates/settings.php:28
 msgid "Folder name"
-msgstr "文件夹名"
+msgstr "Folder name"
 
 #: templates/settings.php:10
 msgid "External storage"
-msgstr "外部存储"
+msgstr "External storage"
 
 #: templates/settings.php:11
 msgid "Configuration"
-msgstr "配置"
+msgstr "Configuration"
 
 #: templates/settings.php:12
 msgid "Options"
-msgstr "选项"
+msgstr "Options"
 
 #: templates/settings.php:13
 msgid "Applicable"
-msgstr "可应用"
+msgstr "Applicable"
 
 #: templates/settings.php:33
 msgid "Add storage"
-msgstr "扩容"
+msgstr "Add storage"
 
 #: templates/settings.php:90
 msgid "None set"
-msgstr "未设置"
+msgstr "None set"
 
 #: templates/settings.php:91
 msgid "All Users"
-msgstr "所有用户"
+msgstr "All Users"
 
 #: templates/settings.php:92
 msgid "Groups"
-msgstr "群组"
+msgstr "Groups"
 
 #: templates/settings.php:100
 msgid "Users"
-msgstr "用户"
+msgstr "Users"
 
 #: templates/settings.php:113 templates/settings.php:114
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr "删除"
+msgstr "Delete"
 
 #: templates/settings.php:129
 msgid "Enable User External Storage"
-msgstr "启用用户外部存储"
+msgstr "Enable User External Storage"
 
 #: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
-msgstr "允许用户挂载他们的外部存储"
+msgstr "Allow users to mount their own external storage"
 
 #: templates/settings.php:141
 msgid "SSL root certificates"
-msgstr "SSL 根证书"
+msgstr "SSL root certificates"
 
 #: templates/settings.php:159
 msgid "Import Root Certificate"
-msgstr "导入根证书"
+msgstr "Import Root Certificate"
diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/en_GB/files_sharing.po
similarity index 61%
rename from l10n/zh_CN.GB2312/files_sharing.po
rename to l10n/en_GB/files_sharing.po
index 72a289d020985de874eab21ee9f4319dd9ce8cf1..93495b536e6408cd8ada53a0cb77b7b25ad78e1e 100644
--- a/l10n/zh_CN.GB2312/files_sharing.po
+++ b/l10n/en_GB/files_sharing.po
@@ -3,79 +3,79 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# aivier <iaivier@126.com>, 2013
+# mnestis <transifex@mnestis.net>, 2013
 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"
-"Last-Translator: aivier <iaivier@126.com>\n"
-"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-29 17:00+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"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN.GB2312\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
 msgid "The password is wrong. Try again."
-msgstr "密码错误。请重试。"
+msgstr "The password is wrong. Try again."
 
 #: templates/authenticate.php:7
 msgid "Password"
-msgstr "密码"
+msgstr "Password"
 
 #: templates/authenticate.php:9
 msgid "Submit"
-msgstr "提交"
+msgstr "Submit"
 
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr "对不起，这个链接看起来是错误的。"
+msgstr "Sorry, this link doesn’t seem to work anymore."
 
 #: templates/part.404.php:4
 msgid "Reasons might be:"
-msgstr "原因可能是:"
+msgstr "Reasons might be:"
 
 #: templates/part.404.php:6
 msgid "the item was removed"
-msgstr "项目已经移除"
+msgstr "the item was removed"
 
 #: templates/part.404.php:7
 msgid "the link expired"
-msgstr "链接已过期"
+msgstr "the link expired"
 
 #: templates/part.404.php:8
 msgid "sharing is disabled"
-msgstr "分享已经被禁用"
+msgstr "sharing is disabled"
 
 #: templates/part.404.php:10
 msgid "For more info, please ask the person who sent this link."
-msgstr "欲了解更多信息，请联系将此链接发送给你的人。"
+msgstr "For more info, please ask the person who sent this link."
 
 #: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
-msgstr "%s 与您分享了文件夹 %s"
+msgstr "%s shared the folder %s with you"
 
 #: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
-msgstr "%s 与您分享了文件 %s"
+msgstr "%s shared the file %s with you"
 
 #: templates/public.php:26 templates/public.php:88
 msgid "Download"
-msgstr "下载"
+msgstr "Download"
 
 #: templates/public.php:43 templates/public.php:46
 msgid "Upload"
-msgstr "上传"
+msgstr "Upload"
 
 #: templates/public.php:56
 msgid "Cancel upload"
-msgstr "取消上传"
+msgstr "Cancel upload"
 
 #: templates/public.php:85
 msgid "No preview available for"
-msgstr "没有预览可用于"
+msgstr "No preview available for"
diff --git a/l10n/en_GB/files_trashbin.po b/l10n/en_GB/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..ae821adafa1f9d0144a48b882c5923c7df84a324
--- /dev/null
+++ b/l10n/en_GB/files_trashbin.po
@@ -0,0 +1,85 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# mnestis <transifex@mnestis.net>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-29 17:10+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:42
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr "Couldn't delete %s permanently"
+
+#: ajax/undelete.php:42
+#, php-format
+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
+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:184 templates/index.php:17
+msgid "Name"
+msgstr "Name"
+
+#: js/trash.js:185 templates/index.php:27
+msgid "Deleted"
+msgstr "Deleted"
+
+#: js/trash.js:193
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] "%n folders"
+
+#: js/trash.js:199
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] "%n files"
+
+#: lib/trash.php:814 lib/trash.php:816
+msgid "restored"
+msgstr "restored"
+
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Nothing in here. Your recycle bin is empty!"
+
+#: templates/index.php:20 templates/index.php:22
+msgid "Restore"
+msgstr "Restore"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Delete"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr "Deleted Files"
diff --git a/l10n/zh_CN.GB2312/files_versions.po b/l10n/en_GB/files_versions.po
similarity index 55%
rename from l10n/zh_CN.GB2312/files_versions.po
rename to l10n/en_GB/files_versions.po
index faa83e8fc6c02171435bcbec1a535f4b84e22e82..e727185fa79aa1945d4d4152aa9a168f7dada940 100644
--- a/l10n/zh_CN.GB2312/files_versions.po
+++ b/l10n/en_GB/files_versions.po
@@ -3,42 +3,42 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# aivier <iaivier@126.com>, 2013
+# mnestis <transifex@mnestis.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-15 11:00+0000\n"
-"Last-Translator: aivier <iaivier@126.com>\n"
-"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-29 17:10+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"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN.GB2312\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
-msgstr "无法恢复：%s"
+msgstr "Could not revert: %s"
 
 #: js/versions.js:7
 msgid "Versions"
-msgstr "版本"
+msgstr "Versions"
 
 #: js/versions.js:53
 msgid "Failed to revert {file} to revision {timestamp}."
-msgstr "无法恢复文件  {file} 到 版本 {timestamp}。"
+msgstr "Failed to revert {file} to revision {timestamp}."
 
 #: js/versions.js:79
 msgid "More versions..."
-msgstr "更多版本"
+msgstr "More versions..."
 
 #: js/versions.js:116
 msgid "No other versions available"
-msgstr "没有其他可用版本"
+msgstr "No other versions available"
 
-#: js/versions.js:149
+#: js/versions.js:145
 msgid "Restore"
-msgstr "恢复"
+msgstr "Restore"
diff --git a/l10n/zh_CN.GB2312/lib.po b/l10n/en_GB/lib.po
similarity index 64%
rename from l10n/zh_CN.GB2312/lib.po
rename to l10n/en_GB/lib.po
index 26675677bdd5b88a6bca3c12a5aef2d8de3f04d3..413e7ae427d53ebe83359e8ff37e4dffa9a13c06 100644
--- a/l10n/zh_CN.GB2312/lib.po
+++ b/l10n/en_GB/lib.po
@@ -3,195 +3,196 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# mnestis <transifex@mnestis.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"POT-Creation-Date: 2013-08-30 09:33-0400\n"
+"PO-Revision-Date: 2013-08-29 16:50+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"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN.GB2312\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: app.php:239
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "App \"%s\" can't be installed because it is not compatible with this version of ownCloud."
 
 #: app.php:250
 msgid "No app name specified"
-msgstr ""
+msgstr "No app name specified"
 
 #: app.php:361
 msgid "Help"
-msgstr "帮助"
+msgstr "Help"
 
 #: app.php:374
 msgid "Personal"
-msgstr "私人"
+msgstr "Personal"
 
 #: app.php:385
 msgid "Settings"
-msgstr "设置"
+msgstr "Settings"
 
 #: app.php:397
 msgid "Users"
-msgstr "用户"
+msgstr "Users"
 
 #: app.php:410
 msgid "Admin"
-msgstr "管理员"
+msgstr "Admin"
 
 #: app.php:837
 #, php-format
 msgid "Failed to upgrade \"%s\"."
-msgstr ""
+msgstr "Failed to upgrade \"%s\"."
 
 #: defaults.php:35
 msgid "web services under your control"
-msgstr "您控制的网络服务"
+msgstr "web services under your control"
 
 #: files.php:66 files.php:98
 #, php-format
 msgid "cannot open \"%s\""
-msgstr ""
+msgstr "cannot open \"%s\""
 
 #: files.php:226
 msgid "ZIP download is turned off."
-msgstr "ZIP 下载已关闭"
+msgstr "ZIP download is turned off."
 
 #: files.php:227
 msgid "Files need to be downloaded one by one."
-msgstr "需要逐个下载文件。"
+msgstr "Files need to be downloaded one by one."
 
 #: files.php:228 files.php:256
 msgid "Back to Files"
-msgstr "返回到文件"
+msgstr "Back to Files"
 
 #: files.php:253
 msgid "Selected files too large to generate zip file."
-msgstr "选择的文件太大而不能生成 zip 文件。"
+msgstr "Selected files too large to generate zip file."
 
 #: files.php:254
 msgid ""
 "Download the files in smaller chunks, seperately or kindly ask your "
 "administrator."
-msgstr ""
+msgstr "Download the files in smaller chunks, seperately or kindly ask your administrator."
 
 #: installer.php:63
 msgid "No source specified when installing app"
-msgstr ""
+msgstr "No source specified when installing app"
 
 #: installer.php:70
 msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "No href specified when installing app from http"
 
 #: installer.php:75
 msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "No path specified when installing app from local file"
 
 #: installer.php:89
 #, php-format
 msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Archives of type %s are not supported"
 
 #: installer.php:103
 msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Failed to open archive when installing app"
 
 #: installer.php:123
 msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "App does not provide an info.xml file"
 
 #: installer.php:129
 msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "App can't be installed because of unallowed code in the App"
 
 #: installer.php:138
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
-msgstr ""
+msgstr "App can't be installed because it is not compatible with this version of ownCloud"
 
 #: installer.php:144
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
-msgstr ""
+msgstr "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps"
 
 #: installer.php:150
 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 ""
+msgstr "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store"
 
 #: installer.php:160
 msgid "App directory already exists"
-msgstr ""
+msgstr "App directory already exists"
 
 #: installer.php:173
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Can't create app folder. Please fix permissions. %s"
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr "应用未启用"
+msgstr "Application is not enabled"
 
 #: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
-msgstr "验证错误"
+msgstr "Authentication error"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr "会话过期。请刷新页面。"
+msgstr "Token expired. Please reload page."
 
 #: search/provider/file.php:17 search/provider/file.php:35
 msgid "Files"
-msgstr "文件"
+msgstr "Files"
 
 #: search/provider/file.php:26 search/provider/file.php:33
 msgid "Text"
-msgstr "文本"
+msgstr "Text"
 
 #: search/provider/file.php:29
 msgid "Images"
-msgstr "图片"
+msgstr "Images"
 
 #: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
-msgstr ""
+msgstr "%s enter the database username."
 
 #: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "%s enter the database name."
 
 #: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s you may not use dots in the database name"
 
 #: setup/mssql.php:20
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
+msgstr "MS SQL username and/or password not valid: %s"
 
 #: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
 #: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
-msgstr ""
+msgstr "You need to enter either an existing account or the administrator."
 
 #: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "MySQL username and/or password not valid"
 
 #: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
 #: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
@@ -200,7 +201,7 @@ msgstr ""
 #: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "DB Error: \"%s\""
 
 #: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
 #: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
@@ -208,111 +209,115 @@ msgstr ""
 #: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "Offending command was: \"%s\""
 
 #: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "MySQL user '%s'@'localhost' exists already."
 
 #: setup/mysql.php:86
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "Drop this user from MySQL"
 
 #: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL user '%s'@'%%' already exists"
 
 #: setup/mysql.php:92
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "Drop this user from MySQL."
 
 #: setup/oci.php:34
 msgid "Oracle connection could not be established"
-msgstr ""
+msgstr "Oracle connection could not be established"
 
 #: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Oracle username and/or password not valid"
 
 #: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "Offending command was: \"%s\", name: %s, password: %s"
 
 #: setup/postgresql.php:23 setup/postgresql.php:69
 msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "PostgreSQL username and/or password not valid"
 
 #: setup.php:28
 msgid "Set an admin username."
-msgstr ""
+msgstr "Set an admin username."
 
 #: setup.php:31
 msgid "Set an admin password."
-msgstr ""
+msgstr "Set an admin password."
 
 #: 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 "因WebDAV接口故障，您的网络服务器好像并未允许文件同步。"
+msgstr "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken."
 
 #: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "请双击<a href='%s'>安装向导</a>。"
+msgstr "Please double check the <a href='%s'>installation guides</a>."
 
 #: template/functions.php:80
 msgid "seconds ago"
-msgstr "秒前"
+msgstr "seconds ago"
 
 #: template/functions.php:81
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] "%n 分钟以前"
+msgstr[0] ""
+msgstr[1] "%n minutes ago"
 
 #: template/functions.php:82
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] "%n 小时以前"
+msgstr[0] ""
+msgstr[1] "%n hours ago"
 
 #: template/functions.php:83
 msgid "today"
-msgstr "今天"
+msgstr "today"
 
 #: template/functions.php:84
 msgid "yesterday"
-msgstr "昨天"
+msgstr "yesterday"
 
 #: template/functions.php:85
 msgid "%n day go"
 msgid_plural "%n days ago"
-msgstr[0] "%n 天以前"
+msgstr[0] ""
+msgstr[1] "%n days ago"
 
 #: template/functions.php:86
 msgid "last month"
-msgstr "上个月"
+msgstr "last month"
 
 #: template/functions.php:87
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] "%n 个月以前"
+msgstr[0] ""
+msgstr[1] "%n months ago"
 
 #: template/functions.php:88
 msgid "last year"
-msgstr "去年"
+msgstr "last year"
 
 #: template/functions.php:89
 msgid "years ago"
-msgstr "年前"
+msgstr "years ago"
 
 #: template.php:297
 msgid "Caused by:"
-msgstr ""
+msgstr "Caused by:"
 
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
-msgstr ""
+msgstr "Could not find category \"%s\""
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/en_GB/settings.po
similarity index 60%
rename from l10n/zh_CN.GB2312/settings.po
rename to l10n/en_GB/settings.po
index 16967e598a0bb3c68a560a7c1826dbe3ef093042..ece8bf22f34aed28aa448e0fd8be21170badcd26 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/en_GB/settings.po
@@ -3,190 +3,188 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# hlx98007 <hlx98007@gmail.com>, 2013
-# Martin Liu <liuzh66@gmail.com>, 2013
-# hyy0591 <yangyu.huang@gmail.com>, 2013
+# mnestis <transifex@mnestis.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"POT-Creation-Date: 2013-08-30 09:33-0400\n"
+"PO-Revision-Date: 2013-08-29 16:50+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"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN.GB2312\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
-msgstr "不能从App Store 中加载列表"
+msgstr "Unable to load list from App Store"
 
 #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
-msgstr "验证错误"
+msgstr "Authentication error"
 
 #: ajax/changedisplayname.php:31
 msgid "Your display name has been changed."
-msgstr "您的显示名称已修改"
+msgstr "Your display name has been changed."
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
-msgstr "无法更改显示名称"
+msgstr "Unable to change display name"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
-msgstr "群组已存在"
+msgstr "Group already exists"
 
 #: ajax/creategroup.php:19
 msgid "Unable to add group"
-msgstr "未能添加群组"
+msgstr "Unable to add group"
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
-msgstr "Email 保存了"
+msgstr "Email saved"
 
 #: ajax/lostpassword.php:14
 msgid "Invalid email"
-msgstr "非法Email"
+msgstr "Invalid email"
 
 #: ajax/removegroup.php:13
 msgid "Unable to delete group"
-msgstr "未能删除群组"
+msgstr "Unable to delete group"
 
 #: ajax/removeuser.php:25
 msgid "Unable to delete user"
-msgstr "未能删除用户"
+msgstr "Unable to delete user"
 
 #: ajax/setlanguage.php:15
 msgid "Language changed"
-msgstr "语言改变了"
+msgstr "Language changed"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr "非法请求"
+msgstr "Invalid request"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr "管理员无法将自己从管理组中移除"
+msgstr "Admins can't remove themselves from the admin group"
 
 #: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr "未能添加用户到群组 %s"
+msgstr "Unable to add user to group %s"
 
 #: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr "未能将用户从群组 %s 移除"
+msgstr "Unable to remove user from group %s"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr "应用无法升级。"
+msgstr "Couldn't update app."
 
-#: js/apps.js:35
+#: js/apps.js:43
 msgid "Update to {appversion}"
-msgstr "升级至{appversion}"
+msgstr "Update to {appversion}"
 
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
 msgid "Disable"
-msgstr "禁用"
+msgstr "Disable"
 
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
 msgid "Enable"
-msgstr "启用"
+msgstr "Enable"
 
-#: js/apps.js:63
+#: js/apps.js:71
 msgid "Please wait...."
-msgstr "请稍候……"
+msgstr "Please wait...."
 
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
 msgid "Error while disabling app"
-msgstr ""
+msgstr "Error whilst disabling app"
 
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
 msgid "Error while enabling app"
-msgstr ""
+msgstr "Error whilst enabling app"
 
-#: js/apps.js:115
+#: js/apps.js:123
 msgid "Updating...."
-msgstr "升级中……"
+msgstr "Updating...."
 
-#: js/apps.js:118
+#: js/apps.js:126
 msgid "Error while updating app"
-msgstr "应用升级时出现错误"
+msgstr "Error whilst updating app"
 
-#: js/apps.js:118
+#: js/apps.js:126
 msgid "Error"
-msgstr "出错"
+msgstr "Error"
 
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
 msgid "Update"
-msgstr "æ›´æ–°"
+msgstr "Update"
 
-#: js/apps.js:122
+#: js/apps.js:130
 msgid "Updated"
-msgstr "已升级"
+msgstr "Updated"
 
 #: js/personal.js:150
 msgid "Decrypting files... Please wait, this can take some time."
-msgstr ""
+msgstr "Decrypting files... Please wait, this can take some time."
 
 #: js/personal.js:172
 msgid "Saving..."
-msgstr "保存中..."
+msgstr "Saving..."
 
 #: js/users.js:47
 msgid "deleted"
-msgstr "删除"
+msgstr "deleted"
 
 #: js/users.js:47
 msgid "undo"
-msgstr "撤销"
+msgstr "undo"
 
 #: js/users.js:79
 msgid "Unable to remove user"
-msgstr "无法移除用户"
+msgstr "Unable to remove user"
 
 #: js/users.js:92 templates/users.php:26 templates/users.php:87
 #: templates/users.php:112
 msgid "Groups"
-msgstr "群组"
+msgstr "Groups"
 
 #: js/users.js:97 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
-msgstr "群组管理员"
+msgstr "Group Admin"
 
 #: js/users.js:120 templates/users.php:164
 msgid "Delete"
-msgstr "删除"
+msgstr "Delete"
 
 #: js/users.js:277
 msgid "add group"
-msgstr "添加群组"
+msgstr "add group"
 
 #: js/users.js:436
 msgid "A valid username must be provided"
-msgstr "请填写有效用户名"
+msgstr "A valid username must be provided"
 
 #: js/users.js:437 js/users.js:443 js/users.js:458
 msgid "Error creating user"
-msgstr "新增用户时出现错误"
+msgstr "Error creating user"
 
 #: js/users.js:442
 msgid "A valid password must be provided"
-msgstr "请填写有效密码"
+msgstr "A valid password must be provided"
 
 #: personal.php:40 personal.php:41
 msgid "__language_name__"
-msgstr "Chinese"
+msgstr "__language_name__"
 
 #: templates/admin.php:15
 msgid "Security Warning"
-msgstr "安全警告"
+msgstr "Security Warning"
 
 #: templates/admin.php:18
 msgid ""
@@ -195,36 +193,36 @@ msgid ""
 "configure your webserver in a way that the data directory is no longer "
 "accessible or you move the data directory outside the webserver document "
 "root."
-msgstr "您的数据文件夹和您的文件或许能够从互联网访问。ownCloud 提供的 .htaccesss 文件未其作用。我们强烈建议您配置网络服务器以使数据文件夹不能从互联网访问，或将移动数据文件夹移出网络服务器文档根目录。"
+msgstr "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."
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr "配置注意"
+msgstr "Setup Warning"
 
 #: 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 "因WebDAV接口故障，您的网络服务器好像并未允许文件同步。"
+msgstr "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken."
 
 #: templates/admin.php:33
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr "请双击<a href='%s'>安装向导</a>。"
+msgstr "Please double check the <a href=\"%s\">installation guides</a>."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
-msgstr "模块“fileinfo”丢失。"
+msgstr "Module 'fileinfo' missing"
 
 #: 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 "PHP 模块“fileinfo”丢失。我们强烈建议打开此模块来获得 mine 类型检测的最佳结果。"
+msgstr "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection."
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr "区域设置未运作"
+msgstr "Locale not working"
 
 #: templates/admin.php:63
 #, php-format
@@ -232,11 +230,11 @@ 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 "ownCloud 服务器不能把系统区域设置为 %s。这意味着文件名可内可能含有某些引起问题的字符。我们强烈建议在您的系统上安装必要的区域/语言支持包来支持 “%s” 。"
+msgstr "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."
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr "互联网连接未运作"
+msgstr "Internet connection not working"
 
 #: templates/admin.php:78
 msgid ""
@@ -245,7 +243,7 @@ msgid ""
 "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 "服务器没有可用的Internet连接。这意味着像挂载外部储存、版本更新提示和安装第三方插件等功能会失效。远程访问文件和发送邮件提醒也可能会失效。如果您需要这些功能，建议开启服务器的英特网连接。"
+msgstr "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."
 
 #: templates/admin.php:92
 msgid "Cron"
@@ -253,102 +251,102 @@ msgstr "Cron"
 
 #: templates/admin.php:99
 msgid "Execute one task with each page loaded"
-msgstr "在每个页面载入时执行一项任务"
+msgstr "Execute one task with each page loaded"
 
 #: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
-msgstr "cron.php 已作为 webcron 服务注册。owncloud 将通过 http 协议每分钟调用一次 cron.php。"
+msgstr "cron.php is registered at a webcron service to call cron.php once a minute over http."
 
 #: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
-msgstr "使用系统 cron 服务。通过系统 cronjob 每分钟调用一次 owncloud 文件夹下的 cron.php"
+msgstr "Use systems cron service to call the cron.php file once a minute."
 
 #: templates/admin.php:120
 msgid "Sharing"
-msgstr "分享"
+msgstr "Sharing"
 
 #: templates/admin.php:126
 msgid "Enable Share API"
-msgstr "开启分享API"
+msgstr "Enable Share API"
 
 #: templates/admin.php:127
 msgid "Allow apps to use the Share API"
-msgstr "允许应用使用分享API"
+msgstr "Allow apps to use the Share API"
 
 #: templates/admin.php:134
 msgid "Allow links"
-msgstr "允许链接"
+msgstr "Allow links"
 
 #: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
-msgstr "允许用户通过链接共享内容"
+msgstr "Allow users to share items to the public with links"
 
 #: templates/admin.php:143
 msgid "Allow public uploads"
-msgstr "允许公众账户上传"
+msgstr "Allow public uploads"
 
 #: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
-msgstr "允许其它人向用户的公众共享文件夹里上传文件"
+msgstr "Allow users to enable others to upload into their publicly shared folders"
 
 #: templates/admin.php:152
 msgid "Allow resharing"
-msgstr "允许转帖"
+msgstr "Allow resharing"
 
 #: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
-msgstr "允许用户再次共享已共享的内容"
+msgstr "Allow users to share items shared with them again"
 
 #: templates/admin.php:160
 msgid "Allow users to share with anyone"
-msgstr "允许用户向任何人分享"
+msgstr "Allow users to share with anyone"
 
 #: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
-msgstr "只允许用户向所在群组中的其他用户分享"
+msgstr "Allow users to only share with users in their groups"
 
 #: templates/admin.php:170
 msgid "Security"
-msgstr "安全"
+msgstr "Security"
 
 #: templates/admin.php:183
 msgid "Enforce HTTPS"
-msgstr "强制HTTPS"
+msgstr "Enforce HTTPS"
 
 #: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr "强制客户端通过加密连接与%s连接"
+msgstr "Forces the clients to connect to %s via an encrypted connection."
 
 #: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
-msgstr "请通过HTTPS协议连接到 %s，需要启用或者禁止强制SSL的开关。"
+msgstr "Please connect to your %s via HTTPS to enable or disable the SSL enforcement."
 
 #: templates/admin.php:203
 msgid "Log"
-msgstr "日志"
+msgstr "Log"
 
 #: templates/admin.php:204
 msgid "Log level"
-msgstr "日志等级"
+msgstr "Log level"
 
 #: templates/admin.php:235
 msgid "More"
-msgstr "更多"
+msgstr "More"
 
 #: templates/admin.php:236
 msgid "Less"
-msgstr "æ›´å°‘"
+msgstr "Less"
 
 #: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
-msgstr "版本"
+msgstr "Version"
 
 #: templates/admin.php:246 templates/personal.php:143
 msgid ""
@@ -358,112 +356,112 @@ msgid ""
 "licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
 "target=\"_blank\"><abbr title=\"Affero General Public "
 "License\">AGPL</abbr></a>."
-msgstr "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社区</a>开发，<a href=\"https://github.com/owncloud\" target=\"_blank\">s源代码</a> 以 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 许可协议发布。"
+msgstr "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>."
 
 #: templates/apps.php:13
 msgid "Add your App"
-msgstr "添加你的应用程序"
+msgstr "Add your App"
 
 #: templates/apps.php:28
 msgid "More Apps"
-msgstr "更多应用"
+msgstr "More Apps"
 
 #: templates/apps.php:33
 msgid "Select an App"
-msgstr "选择一个程序"
+msgstr "Select an App"
 
 #: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
-msgstr "在owncloud.com上查看应用程序"
+msgstr "See application page at apps.owncloud.com"
 
 #: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr "<span class=\"licence\"></span>授权协议 <span class=\"author\"></span>"
+msgstr "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 
 #: templates/help.php:4
 msgid "User Documentation"
-msgstr "用户文档"
+msgstr "User Documentation"
 
 #: templates/help.php:6
 msgid "Administrator Documentation"
-msgstr "管理员文档"
+msgstr "Administrator Documentation"
 
 #: templates/help.php:9
 msgid "Online Documentation"
-msgstr "在线说明文档"
+msgstr "Online Documentation"
 
 #: templates/help.php:11
 msgid "Forum"
-msgstr "论坛"
+msgstr "Forum"
 
 #: templates/help.php:14
 msgid "Bugtracker"
-msgstr "Bug追踪者"
+msgstr "Bugtracker"
 
 #: templates/help.php:17
 msgid "Commercial Support"
-msgstr "商业支持"
+msgstr "Commercial Support"
 
 #: templates/personal.php:8
 msgid "Get the apps to sync your files"
-msgstr "获取应用并同步您的文件"
+msgstr "Get the apps to sync your files"
 
 #: templates/personal.php:19
 msgid "Show First Run Wizard again"
-msgstr "再次显示首次运行向导"
+msgstr "Show First Run Wizard again"
 
 #: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "您已使用<strong>%s</strong>/<strong>%s</strong>"
+msgstr "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 
 #: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
-msgstr "密码"
+msgstr "Password"
 
 #: templates/personal.php:40
 msgid "Your password was changed"
-msgstr "您的密码以变更"
+msgstr "Your password was changed"
 
 #: templates/personal.php:41
 msgid "Unable to change your password"
-msgstr "不能改变你的密码"
+msgstr "Unable to change your password"
 
 #: templates/personal.php:42
 msgid "Current password"
-msgstr "现在的密码"
+msgstr "Current password"
 
 #: templates/personal.php:44
 msgid "New password"
-msgstr "新密码"
+msgstr "New password"
 
 #: templates/personal.php:46
 msgid "Change password"
-msgstr "改变密码"
+msgstr "Change password"
 
 #: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
-msgstr "显示名称"
+msgstr "Display Name"
 
 #: templates/personal.php:73
 msgid "Email"
-msgstr "电子邮件"
+msgstr "Email"
 
 #: templates/personal.php:75
 msgid "Your email address"
-msgstr "你的email地址"
+msgstr "Your email address"
 
 #: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
-msgstr "输入一个邮箱地址以激活密码恢复功能"
+msgstr "Fill in an email address to enable password recovery"
 
 #: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
-msgstr "语言"
+msgstr "Language"
 
 #: templates/personal.php:98
 msgid "Help translate"
-msgstr "帮助翻译"
+msgstr "Help translate"
 
 #: templates/personal.php:104
 msgid "WebDAV"
@@ -474,70 +472,70 @@ msgstr "WebDAV"
 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 "访问WebDAV请点击 <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">此处</a>"
+msgstr "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>"
 
 #: templates/personal.php:117
 msgid "Encryption"
-msgstr "加密"
+msgstr "Encryption"
 
 #: templates/personal.php:119
 msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr ""
+msgstr "The encryption app is no longer enabled, decrypt all your files"
 
 #: templates/personal.php:125
 msgid "Log-in password"
-msgstr ""
+msgstr "Log-in password"
 
 #: templates/personal.php:130
 msgid "Decrypt all Files"
-msgstr ""
+msgstr "Decrypt all Files"
 
 #: templates/users.php:21
 msgid "Login Name"
-msgstr "登录名"
+msgstr "Login Name"
 
 #: templates/users.php:30
 msgid "Create"
-msgstr "新建"
+msgstr "Create"
 
 #: templates/users.php:36
 msgid "Admin Recovery Password"
-msgstr "管理员恢复密码"
+msgstr "Admin Recovery Password"
 
 #: templates/users.php:37 templates/users.php:38
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
-msgstr "在恢复密码的过程中请输入恢复密钥来恢复用户数据"
+msgstr "Enter the recovery password in order to recover the user's files during password change"
 
 #: templates/users.php:42
 msgid "Default Storage"
-msgstr "默认容量"
+msgstr "Default Storage"
 
 #: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
-msgstr "无限制"
+msgstr "Unlimited"
 
 #: templates/users.php:66 templates/users.php:157
 msgid "Other"
-msgstr "其他"
+msgstr "Other"
 
 #: templates/users.php:84
 msgid "Username"
-msgstr "用户名"
+msgstr "Username"
 
 #: templates/users.php:91
 msgid "Storage"
-msgstr "容量"
+msgstr "Storage"
 
 #: templates/users.php:102
 msgid "change display name"
-msgstr "更改显示名称"
+msgstr "change display name"
 
 #: templates/users.php:106
 msgid "set new password"
-msgstr "设置新的密码"
+msgstr "set new password"
 
 #: templates/users.php:137
 msgid "Default"
-msgstr "默认"
+msgstr "Default"
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/en_GB/user_ldap.po
similarity index 58%
rename from l10n/zh_CN.GB2312/user_ldap.po
rename to l10n/en_GB/user_ldap.po
index 291f44e4bcd5191e0c722e051368c0c59cc4e74d..8ea95e2d3bd4176b99e0b45df4b816ab03dc11e6 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/en_GB/user_ldap.po
@@ -3,334 +3,335 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# mnestis <transifex@mnestis.net>, 2013
 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"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-29 17:30+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"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN.GB2312\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/clearMappings.php:34
 msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "Failed to clear the mappings."
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Failed to delete the server configuration"
 
 #: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "The configuration is valid and the connection could be established!"
 
 #: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr ""
+msgstr "The configuration is valid, but the Bind failed. Please check the server settings and credentials."
 
 #: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr ""
+msgstr "The configuration is invalid. Please look in the ownCloud log for further details."
 
 #: js/settings.js:66
 msgid "Deletion failed"
-msgstr "删除失败"
+msgstr "Deletion failed"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "Take over settings from recent server configuration?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr ""
+msgstr "Keep settings?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
-msgstr ""
+msgstr "Cannot add server configuration"
 
 #: js/settings.js:111
 msgid "mappings cleared"
-msgstr ""
+msgstr "mappings cleared"
 
 #: js/settings.js:112
 msgid "Success"
-msgstr "成功"
+msgstr "Success"
 
 #: js/settings.js:117
 msgid "Error"
-msgstr "出错"
+msgstr "Error"
 
 #: js/settings.js:141
 msgid "Connection test succeeded"
-msgstr ""
+msgstr "Connection test succeeded"
 
 #: js/settings.js:146
 msgid "Connection test failed"
-msgstr ""
+msgstr "Connection test failed"
 
 #: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "Do you really want to delete the current Server Configuration?"
 
 #: js/settings.js:157
 msgid "Confirm Deletion"
-msgstr ""
+msgstr "Confirm Deletion"
 
 #: 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 ""
+msgstr "<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."
 
 #: 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 ""
+msgstr "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it."
 
 #: templates/settings.php:16
 msgid "Server configuration"
-msgstr ""
+msgstr "Server configuration"
 
 #: templates/settings.php:32
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "Add Server Configuration"
 
 #: templates/settings.php:37
 msgid "Host"
-msgstr "主机"
+msgstr "Host"
 
 #: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr "您可以忽略协议，除非您需要 SSL。然后用 ldaps:// 开头"
+msgstr "You can omit the protocol, except you require SSL. Then start with ldaps://"
 
 #: templates/settings.php:40
 msgid "Base DN"
-msgstr "基本判别名"
+msgstr "Base DN"
 
 #: templates/settings.php:41
 msgid "One Base DN per line"
-msgstr ""
+msgstr "One Base DN per line"
 
 #: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr "您可以在高级选项卡中为用户和群组指定基本判别名"
+msgstr "You can specify Base DN for users and groups in the Advanced tab"
 
 #: templates/settings.php:44
 msgid "User DN"
-msgstr "用户判别名"
+msgstr "User DN"
 
 #: templates/settings.php:46
 msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
-msgstr "客户机用户的判别名，将用于绑定，例如 uid=agent, dc=example, dc=com。匿名访问请留空判别名和密码。"
+msgstr "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."
 
 #: templates/settings.php:47
 msgid "Password"
-msgstr "密码"
+msgstr "Password"
 
 #: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
-msgstr "匿名访问请留空判别名和密码。"
+msgstr "For anonymous access, leave DN and Password empty."
 
 #: templates/settings.php:51
 msgid "User Login Filter"
-msgstr "用户登录过滤器"
+msgstr "User Login Filter"
 
 #: 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 ""
+msgstr "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\""
 
 #: templates/settings.php:55
 msgid "User List Filter"
-msgstr "用户列表过滤器"
+msgstr "User List Filter"
 
 #: templates/settings.php:58
 msgid ""
 "Defines the filter to apply, when retrieving users (no placeholders). "
 "Example: \"objectClass=person\""
-msgstr ""
+msgstr "Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\""
 
 #: templates/settings.php:59
 msgid "Group Filter"
-msgstr "群组过滤器"
+msgstr "Group Filter"
 
 #: templates/settings.php:62
 msgid ""
 "Defines the filter to apply, when retrieving groups (no placeholders). "
 "Example: \"objectClass=posixGroup\""
-msgstr ""
+msgstr "Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\""
 
 #: templates/settings.php:66
 msgid "Connection Settings"
-msgstr ""
+msgstr "Connection Settings"
 
 #: templates/settings.php:68
 msgid "Configuration Active"
-msgstr ""
+msgstr "Configuration Active"
 
 #: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "When unchecked, this configuration will be skipped."
 
 #: templates/settings.php:69
 msgid "Port"
-msgstr "端口"
+msgstr "Port"
 
 #: templates/settings.php:70
 msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "Backup (Replica) Host"
 
 #: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
-msgstr ""
+msgstr "Give an optional backup host. It must be a replica of the main LDAP/AD server."
 
 #: templates/settings.php:71
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Backup (Replica) Port"
 
 #: templates/settings.php:72
 msgid "Disable Main Server"
-msgstr ""
+msgstr "Disable Main Server"
 
 #: templates/settings.php:72
 msgid "Only connect to the replica server."
-msgstr ""
+msgstr "Only connect to the replica server."
 
 #: templates/settings.php:73
 msgid "Use TLS"
-msgstr "使用 TLS"
+msgstr "Use TLS"
 
 #: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
+msgstr "Do not use it additionally for LDAPS connections, it will fail."
 
 #: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
-msgstr "大小写不敏感的 LDAP 服务器 (Windows)"
+msgstr "Case insensitve LDAP server (Windows)"
 
 #: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
-msgstr "关闭 SSL 证书校验。"
+msgstr "Turn off SSL certificate validation."
 
 #: 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 ""
+msgstr "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."
 
 #: templates/settings.php:76
 msgid "Cache Time-To-Live"
-msgstr ""
+msgstr "Cache Time-To-Live"
 
 #: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
-msgstr "以秒计。修改会清空缓存。"
+msgstr "in seconds. A change empties the cache."
 
 #: templates/settings.php:78
 msgid "Directory Settings"
-msgstr ""
+msgstr "Directory Settings"
 
 #: templates/settings.php:80
 msgid "User Display Name Field"
-msgstr "用户显示名称字段"
+msgstr "User Display Name Field"
 
 #: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
-msgstr ""
+msgstr "The LDAP attribute to use to generate the user's display name."
 
 #: templates/settings.php:81
 msgid "Base User Tree"
-msgstr "基本用户树"
+msgstr "Base User Tree"
 
 #: templates/settings.php:81
 msgid "One User Base DN per line"
-msgstr ""
+msgstr "One User Base DN per line"
 
 #: templates/settings.php:82
 msgid "User Search Attributes"
-msgstr ""
+msgstr "User Search Attributes"
 
 #: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
-msgstr ""
+msgstr "Optional; one attribute per line"
 
 #: templates/settings.php:83
 msgid "Group Display Name Field"
-msgstr "群组显示名称字段"
+msgstr "Group Display Name Field"
 
 #: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
-msgstr ""
+msgstr "The LDAP attribute to use to generate the group's display name."
 
 #: templates/settings.php:84
 msgid "Base Group Tree"
-msgstr "基本群组树"
+msgstr "Base Group Tree"
 
 #: templates/settings.php:84
 msgid "One Group Base DN per line"
-msgstr ""
+msgstr "One Group Base DN per line"
 
 #: templates/settings.php:85
 msgid "Group Search Attributes"
-msgstr ""
+msgstr "Group Search Attributes"
 
 #: templates/settings.php:86
 msgid "Group-Member association"
-msgstr "群组-成员组合"
+msgstr "Group-Member association"
 
 #: templates/settings.php:88
 msgid "Special Attributes"
-msgstr ""
+msgstr "Special Attributes"
 
 #: templates/settings.php:90
 msgid "Quota Field"
-msgstr ""
+msgstr "Quota Field"
 
 #: templates/settings.php:91
 msgid "Quota Default"
-msgstr ""
+msgstr "Quota Default"
 
 #: templates/settings.php:91
 msgid "in bytes"
-msgstr "以字节计"
+msgstr "in bytes"
 
 #: templates/settings.php:92
 msgid "Email Field"
-msgstr ""
+msgstr "Email Field"
 
 #: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
-msgstr ""
+msgstr "User Home Folder Naming Rule"
 
 #: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr "用户名请留空 (默认)。否则，请指定一个 LDAP/AD 属性。"
+msgstr "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute."
 
 #: templates/settings.php:98
 msgid "Internal Username"
-msgstr ""
+msgstr "Internal Username"
 
 #: templates/settings.php:99
 msgid ""
@@ -346,15 +347,15 @@ msgid ""
 "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 ""
+msgstr "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 behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users."
 
 #: templates/settings.php:100
 msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "Internal Username Attribute:"
 
 #: templates/settings.php:101
 msgid "Override UUID detection"
-msgstr ""
+msgstr "Override UUID detection"
 
 #: templates/settings.php:102
 msgid ""
@@ -365,15 +366,15 @@ msgid ""
 "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 ""
+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 ""
+msgstr "UUID Attribute:"
 
 #: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "Username-LDAP User Mapping"
 
 #: templates/settings.php:105
 msgid ""
@@ -387,20 +388,20 @@ msgid ""
 " 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 ""
+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
 msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "Clear Username-LDAP User Mapping"
 
 #: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "Clear Groupname-LDAP Group Mapping"
 
 #: templates/settings.php:108
 msgid "Test Configuration"
-msgstr ""
+msgstr "Test Configuration"
 
 #: templates/settings.php:108
 msgid "Help"
-msgstr "帮助"
+msgstr "Help"
diff --git a/l10n/zh_CN.GB2312/user_webdavauth.po b/l10n/en_GB/user_webdavauth.po
similarity index 54%
rename from l10n/zh_CN.GB2312/user_webdavauth.po
rename to l10n/en_GB/user_webdavauth.po
index bcfa856ac0caa13f37829454f8b31e620f4adf37..210787a40fa15151fd45e116611886e3eb3310c4 100644
--- a/l10n/zh_CN.GB2312/user_webdavauth.po
+++ b/l10n/en_GB/user_webdavauth.po
@@ -3,32 +3,32 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# aivier <iaivier@126.com>, 2013
+# mnestis <transifex@mnestis.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-15 10:30+0000\n"
-"Last-Translator: aivier <iaivier@126.com>\n"
-"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-29 16:40+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"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN.GB2312\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:3
 msgid "WebDAV Authentication"
-msgstr "WebDAV 验证"
+msgstr "WebDAV Authentication"
 
 #: templates/settings.php:4
 msgid "Address: "
-msgstr "地址："
+msgstr "Address: "
 
 #: 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 ""
+msgstr "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."
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 0ce78d871f58b3d6ba64964a99b590e99d94bfb6..1c4e9c35417042ee159663f2c7d47e5585c79a5c 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s kunhavigis “%s” kun vi"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Ne proviziĝis tipon de kategorio."
@@ -195,23 +224,23 @@ msgstr "lastajare"
 msgid "years ago"
 msgstr "jaroj antaÅ­e"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Elekti"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Jes"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Ne"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Akcepti"
 
@@ -444,7 +473,7 @@ msgstr "Persona"
 msgid "Users"
 msgstr "Uzantoj"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Aplikaĵoj"
 
@@ -577,10 +606,6 @@ msgstr "%s haveblas. Ekhavi pli da informo pri kiel ĝisdatigi."
 msgid "Log out"
 msgstr "Elsaluti"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "La aŭtomata ensaluto malakceptiĝis!"
@@ -595,19 +620,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Ĉu vi perdis vian pasvorton?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "memori"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Ensaluti"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Alternativaj ensalutoj"
 
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index 418410ebe52ce468d49a1b574f535bc3236488b5..af8d82e0aaba73337b54262be1531a9700cb9ce4 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +75,11 @@ msgstr "Malsukcesis skribo al disko"
 msgid "Not enough storage available"
 msgstr "Ne haveblas sufiĉa memoro"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Nevalida dosierujo."
 
@@ -95,21 +99,20 @@ msgstr "Ne haveblas sufiĉa spaco"
 msgid "Upload cancelled."
 msgstr "La alŝuto nuliĝis."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL ne povas esti malplena."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 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:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Eraro"
 
@@ -125,41 +128,57 @@ msgstr "Forigi por ĉiam"
 msgid "Rename"
 msgstr "Alinomigi"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Traktotaj"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} jam ekzistas"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "anstataÅ­igi"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "sugesti nomon"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "nuligi"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "anstataŭiĝis {new_name} per {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "malfari"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "dosieroj estas alŝutataj"
 
@@ -197,34 +216,18 @@ msgid ""
 "big."
 msgstr "Via elŝuto pretiĝatas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Nevalida dosierujnomo. Uzo de “Shared” rezervatas de Owncloud."
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Nomo"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Grando"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Modifita"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -328,22 +331,6 @@ msgstr "Dosieroj estas skanataj, bonvolu atendi."
 msgid "Current scanning"
 msgstr "Nuna skano"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "dosiero"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "dosieroj"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Ĝisdatiĝas dosiersistema kaŝmemoro..."
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 9baa98366d8b7df33bc15fb45ec983ba0feaa4c2..d700f0447225d2b70355d232701fd23e32fc46dc 100644
--- a/l10n/es/core.po
+++ b/l10n/es/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -31,6 +31,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s compatido  »%s« contigo"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Tipo de categoría no proporcionado."
@@ -202,23 +231,23 @@ msgstr "el año pasado"
 msgid "years ago"
 msgstr "hace años"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Seleccionar"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "Error cargando la plantilla del seleccionador de archivos"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Sí"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Aceptar"
 
@@ -451,7 +480,7 @@ msgstr "Personal"
 msgid "Users"
 msgstr "Usuarios"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Aplicaciones"
 
@@ -584,10 +613,6 @@ msgstr "%s esta disponible. Obtener mas información de como actualizar."
 msgid "Log out"
 msgstr "Salir"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "¡Inicio de sesión automático rechazado!"
@@ -602,19 +627,19 @@ msgstr "Si usted no ha cambiado su contraseña recientemente, ¡puede que su cue
 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "¿Ha perdido su contraseña?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "recordar"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Entrar"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Inicios de sesión alternativos"
 
diff --git a/l10n/es/files.po b/l10n/es/files.po
index a05bd94c82bf53d99371d16346802729dfe66d75..764ab8c2f262ca829d49723df0f7ae853f68a73e 100644
--- a/l10n/es/files.po
+++ b/l10n/es/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -79,7 +79,11 @@ msgstr "Falló al escribir al disco"
 msgid "Not enough storage available"
 msgstr "No hay suficiente espacio disponible"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Directorio inválido."
 
@@ -99,21 +103,20 @@ msgstr "No hay suficiente espacio disponible"
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "La URL no puede estar vacía."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 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:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Error"
 
@@ -129,41 +132,57 @@ msgstr "Eliminar permanentemente"
 msgid "Rename"
 msgstr "Renombrar"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Pendiente"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "reemplazar"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "sugerir nombre"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "reemplazado {new_name} con {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "subiendo archivos"
 
@@ -201,34 +220,18 @@ msgid ""
 "big."
 msgstr "Su descarga está siendo preparada. Esto puede tardar algún tiempo si los archivos son grandes."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Nombre de carpeta no es válido. El uso de \"Shared\" está reservado por Owncloud"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -332,22 +335,6 @@ msgstr "Los archivos están siendo escaneados,  por favor espere."
 msgid "Current scanning"
 msgstr "Escaneo actual"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "carpeta"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "carpetas"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "archivo"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "archivos"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Actualizando caché del sistema de archivos"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 0b0896131370389c1cda6982d23fbe7442aa3c6a..10adfedf5005432c70fb97b5f15f92864d27d4c9 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-26 08:01+0000\n"
+"Last-Translator: eadeprado <eadeprado@outlook.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"
@@ -304,7 +304,7 @@ msgstr "Permitir re-compartición"
 
 #: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
-msgstr "Permitir a los usuarios compartir elementos ya compartidos con ellos mismos"
+msgstr "Permitir a los usuarios compartir de nuevo elementos ya compartidos"
 
 #: templates/admin.php:160
 msgid "Allow users to share with anyone"
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 4bae50605bd3b0f13cdd06bb9ccd8e8e8815cf75..ee3f80addf2c0cd4423146246db7539a342ed1be 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -23,6 +23,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s compartió \"%s\" con vos"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Tipo de categoría no provisto. "
@@ -194,23 +223,23 @@ msgstr "el año pasado"
 msgid "years ago"
 msgstr "años atrás"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Elegir"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "Error al cargar la plantilla del seleccionador de archivos"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Sí"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Aceptar"
 
@@ -443,7 +472,7 @@ msgstr "Personal"
 msgid "Users"
 msgstr "Usuarios"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Apps"
 
@@ -576,10 +605,6 @@ msgstr "%s está disponible. Obtené más información sobre cómo actualizar."
 msgid "Log out"
 msgstr "Cerrar la sesión"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "¡El inicio de sesión automático fue rechazado!"
@@ -594,19 +619,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "¿Perdiste tu contraseña?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "recordame"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Iniciar sesión"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Nombre alternativos de usuarios"
 
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index bc891faa03c2ddba5b7cdc847ba319a26f7bf3fc..9e7e5a0922a8f06c680b5705e96500a7b662c8c2 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -5,12 +5,13 @@
 # Translators:
 # Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
 # cjtess <claudio.tessone@gmail.com>, 2013
+# juliabis, 2013
 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-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -76,7 +77,11 @@ msgstr "Error al escribir en el disco"
 msgid "Not enough storage available"
 msgstr "No hay suficiente almacenamiento"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Directorio inválido."
 
@@ -96,21 +101,20 @@ msgstr "No hay suficiente espacio disponible"
 msgid "Upload cancelled."
 msgstr "La subida fue cancelada"
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "La URL no puede estar vacía"
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 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:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Error"
 
@@ -126,41 +130,57 @@ msgstr "Borrar permanentemente"
 msgid "Rename"
 msgstr "Cambiar nombre"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Pendientes"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "reemplazar"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "sugerir nombre"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "se reemplazó {new_name} con {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "Subiendo archivos"
 
@@ -190,7 +210,7 @@ msgstr "El almacenamiento está casi lleno ({usedSpacePercent}%)"
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
-msgstr ""
+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:245
 msgid ""
@@ -198,34 +218,18 @@ msgid ""
 "big."
 msgstr "Tu descarga se está preparando. Esto puede demorar si los archivos son muy grandes."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Nombre de carpeta inválido. El uso de 'Shared' está reservado por ownCloud"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -329,22 +333,6 @@ msgstr "Se están escaneando los archivos, por favor esperá."
 msgid "Current scanning"
 msgstr "Escaneo actual"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "directorio"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "directorios"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "archivo"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "archivos"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Actualizando el cache del sistema de archivos"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 57158ce0f0ee2b7652f92040e4b378cae4dbb295..7b3a992357f2db5cd44b7e9ea9e394c8c525c45b 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-08-22 10:36-0400\n"
-"PO-Revision-Date: 2013-08-22 09:40+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -24,6 +24,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s jagas sinuga »%s«"
 
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr "Haldusreziimis"
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr "Haldusreziim lõpetatud"
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr "Uuendatud andmebaas"
+
+#: ajax/update.php:20
+msgid "Updating filecache, this may take really long..."
+msgstr "Uuendan failipuhvrit, see võib kesta väga kaua..."
+
+#: ajax/update.php:23
+msgid "Updated filecache"
+msgstr "Uuendatud failipuhver"
+
+#: ajax/update.php:26
+#, php-format
+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."
@@ -444,7 +473,7 @@ msgstr "Isiklik"
 msgid "Users"
 msgstr "Kasutajad"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Rakendused"
 
@@ -577,10 +606,6 @@ msgstr "%s on saadaval. Vaata lähemalt kuidas uuendada."
 msgid "Log out"
 msgstr "Logi välja"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Rohkem rakendusi"
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automaatne sisselogimine lükati tagasi!"
@@ -595,19 +620,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Kaotasid oma parooli?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "pea meeles"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Logi sisse"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Alternatiivsed sisselogimisviisid"
 
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 582197b1dcdeee4d7fc1e500da5050cf00943d04..f69d10f72ecad62ce53e7eb56b1ed90942f3ab24 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-08-22 10:35-0400\n"
-"PO-Revision-Date: 2013-08-22 09:50+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -76,7 +76,11 @@ msgstr "Kettale kirjutamine ebaõnnestus"
 msgid "Not enough storage available"
 msgstr "Saadaval pole piisavalt ruumi"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Vigane kaust."
 
@@ -96,21 +100,20 @@ msgstr "Pole piisavalt ruumi"
 msgid "Upload cancelled."
 msgstr "Üleslaadimine tühistati."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:234 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL ei saa olla tühi."
 
-#: js/file-upload.js:239 lib/app.php:53
+#: js/file-upload.js:244 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:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Viga"
 
@@ -126,41 +129,57 @@ msgstr "Kustuta jäädavalt"
 msgid "Rename"
 msgstr "Nimeta ümber"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Ootel"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} on juba olemas"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "asenda"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "soovita nime"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "loobu"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "asendas nime {old_name} nimega {new_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "tagasi"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n kataloog"
+msgstr[1] "%n kataloogi"
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n fail"
+msgstr[1] "%n faili"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Laadin üles %n faili"
 msgstr[1] "Laadin üles %n faili"
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "faili üleslaadimisel"
 
@@ -198,34 +217,18 @@ msgid ""
 "big."
 msgstr "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. "
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Vigane kataloogi nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt."
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Suurus"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Muudetud"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n kataloog"
-msgstr[1] "%n kataloogi"
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n fail"
-msgstr[1] "%n faili"
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -329,22 +332,6 @@ msgstr "Faile skannitakse, palun oota."
 msgid "Current scanning"
 msgstr "Praegune skannimine"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "kaust"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "kaustad"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fail"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "faili"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Failisüsteemi puhvri uuendamine..."
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index 82c3b23be8314ec507f00f4960fbdfbdc1e70e79..4e49c86def2301f9ddf93ea7d2583bab33e5b5a4 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-26 05:20+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"
@@ -24,11 +24,11 @@ msgstr ""
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "Rakendit \"%s\" ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga."
 
 #: app.php:250
 msgid "No app name specified"
-msgstr ""
+msgstr "Ühegi rakendi nime pole määratletud"
 
 #: app.php:361
 msgid "Help"
@@ -88,59 +88,59 @@ msgstr "Laadi failid alla eraldi väiksemate osadena või küsi nõu oma süstee
 
 #: installer.php:63
 msgid "No source specified when installing app"
-msgstr ""
+msgstr "Ühegi lähteallikat pole rakendi paigalduseks määratletud"
 
 #: installer.php:70
 msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Ühtegi aadressi pole määratletud rakendi paigalduseks veebist"
 
 #: installer.php:75
 msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Ühtegi teed pole määratletud paigaldamaks rakendit kohalikust failist"
 
 #: installer.php:89
 #, php-format
 msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "%s tüüpi arhiivid pole toetatud"
 
 #: installer.php:103
 msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Arhiivi avamine ebaõnnestus rakendi paigalduse käigus"
 
 #: installer.php:123
 msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "Rakend ei paku ühtegi info.xml faili"
 
 #: installer.php:129
 msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Rakendit ei saa paigaldada, kuna sisaldab lubamatud koodi"
 
 #: installer.php:138
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
-msgstr ""
+msgstr "Rakendit ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga."
 
 #: installer.php:144
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
-msgstr ""
+msgstr "Rakendit ei saa paigaldada, kuna see sisaldab \n<shipped>\n\ntrue\n</shipped>\nmärgendit, mis pole lubatud mitte veetud (non shipped) rakendites"
 
 #: installer.php:150
 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 ""
+msgstr "Rakendit ei saa paigaldada, kuna selle versioon info.xml/version pole sama, mis on märgitud rakendite laos."
 
 #: installer.php:160
 msgid "App directory already exists"
-msgstr ""
+msgstr "Rakendi kataloog on juba olemas"
 
 #: installer.php:173
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Ei saa luua rakendi kataloogi. Palun korrigeeri õigusi. %s"
 
 #: json.php:28
 msgid "Application is not enabled"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 7f6d850ad8f401580724442532156ec0e4140e9a..26f50de9298fbe6389c44c368243e526020d47dd 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-26 05:10+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"
@@ -104,11 +104,11 @@ msgstr "Palun oota..."
 
 #: js/apps.js:71 js/apps.js:72 js/apps.js:92
 msgid "Error while disabling app"
-msgstr ""
+msgstr "Viga rakendi keelamisel"
 
 #: js/apps.js:91 js/apps.js:104 js/apps.js:105
 msgid "Error while enabling app"
-msgstr ""
+msgstr "Viga rakendi lubamisel"
 
 #: js/apps.js:115
 msgid "Updating...."
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 88be117b55791634683c0ba1f54ba4f45b90a15c..004b38fc512a5c0c9d8f96794a74575f4280b7f3 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:00+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -24,6 +24,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s-ek »%s« zurekin partekatu du"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Kategoria mota ez da zehaztu."
@@ -444,7 +473,7 @@ msgstr "Pertsonala"
 msgid "Users"
 msgstr "Erabiltzaileak"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Aplikazioak"
 
@@ -577,10 +606,6 @@ msgstr "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu."
 msgid "Log out"
 msgstr "Saioa bukatu"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "App gehiago"
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Saio hasiera automatikoa ez onartuta!"
@@ -595,19 +620,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Galdu duzu pasahitza?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "gogoratu"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Hasi saioa"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Beste erabiltzaile izenak"
 
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 9240871e8cb288f8856fbca60338127af1222464..bb64b84c2306de35dffe53ccfb4435d554588f5a 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:10+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -76,7 +76,11 @@ msgstr "Errore bat izan da diskoan idazterakoan"
 msgid "Not enough storage available"
 msgstr "Ez dago behar aina leku erabilgarri,"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Baliogabeko karpeta."
 
@@ -96,21 +100,20 @@ msgstr "Ez dago leku nahikorik."
 msgid "Upload cancelled."
 msgstr "Igoera ezeztatuta"
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:234 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URLa ezin da hutsik egon."
 
-#: js/file-upload.js:239 lib/app.php:53
+#: js/file-upload.js:244 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:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Errorea"
 
@@ -126,41 +129,57 @@ msgstr "Ezabatu betirako"
 msgid "Rename"
 msgstr "Berrizendatu"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Zain"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} dagoeneko existitzen da"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "ordeztu"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "aholkatu izena"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "ezeztatu"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr " {new_name}-k {old_name} ordezkatu du"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "desegin"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "karpeta %n"
+msgstr[1] "%n karpeta"
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "fitxategi %n"
+msgstr[1] "%n fitxategi"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Fitxategi %n igotzen"
 msgstr[1] "%n fitxategi igotzen"
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "fitxategiak igotzen"
 
@@ -198,34 +217,18 @@ msgid ""
 "big."
 msgstr "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. "
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Baliogabeako karpeta izena. 'Shared' izena Owncloudek erreserbatzen du"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Izena"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Tamaina"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Aldatuta"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "karpeta %n"
-msgstr[1] "%n karpeta"
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "fitxategi %n"
-msgstr[1] "%n fitxategi"
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -329,22 +332,6 @@ msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez."
 msgid "Current scanning"
 msgstr "Orain eskaneatzen ari da"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "direktorioa"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "direktorioak"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fitxategia"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "fitxategiak"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Fitxategi sistemaren katxea eguneratzen..."
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 1075ec5c3e982b95986db0b9c48294bfd025ab74..4fb8afd07bb39f7eb359e7aebf9a702d4da1a3c7 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -23,6 +23,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s به اشتراک گذاشته شده است »%s« توسط شما"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "نوع دسته بندی ارائه نشده است."
@@ -190,23 +219,23 @@ msgstr "سال قبل"
 msgid "years ago"
 msgstr "سال‌های قبل"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "انتخاب کردن"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "خطا در بارگذاری قالب انتخاب کننده فایل"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "بله"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "نه"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "قبول"
 
@@ -439,7 +468,7 @@ msgstr "شخصی"
 msgid "Users"
 msgstr "کاربران"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "  برنامه ها"
 
@@ -572,10 +601,6 @@ msgstr "%s در دسترس است. برای چگونگی به روز رسانی
 msgid "Log out"
 msgstr "خروج"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "ورود به سیستم اتوماتیک ردشد!"
@@ -590,19 +615,19 @@ msgstr "اگر شما اخیرا رمزعبور را تغییر نداده ای
 msgid "Please change your password to secure your account again."
 msgstr "لطفا رمز عبور خود را تغییر دهید تا مجددا حساب شما  در امان باشد."
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "آیا گذرواژه تان را به یاد نمی آورید؟"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "بیاد آوری"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "ورود"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "ورود متناوب"
 
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index a5fd2a7adb4a0e5c38d809c000eaf06019250ad6..362a1dc80ae0a38b3b2e484b089e4f237f265c39 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +75,11 @@ msgstr "نوشتن بر روی دیسک سخت ناموفق بود"
 msgid "Not enough storage available"
 msgstr "فضای کافی در دسترس نیست"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "فهرست راهنما نامعتبر می باشد."
 
@@ -95,21 +99,20 @@ msgstr "فضای کافی در دسترس نیست"
 msgid "Upload cancelled."
 msgstr "بار گذاری لغو شد"
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. "
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL  نمی تواند خالی باشد."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "نام پوشه نامعتبر است. استفاده از 'به اشتراک گذاشته شده' متعلق به ownCloud میباشد."
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "خطا"
 
@@ -125,40 +128,54 @@ msgstr "حذف قطعی"
 msgid "Rename"
 msgstr "تغییرنام"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "در انتظار"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{نام _جدید} در حال حاضر وجود دارد."
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "جایگزین"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "پیشنهاد نام"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "لغو"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "{نام_جدید} با { نام_قدیمی} جایگزین شد."
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "بازگشت"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "بارگذاری فایل ها"
 
@@ -196,32 +213,18 @@ msgid ""
 "big."
 msgstr "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "نام پوشه نامعتبر است. استفاده از \" به اشتراک گذاشته شده \" متعلق به سایت Owncloud است."
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "نام"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "اندازه"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "تاریخ"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -325,22 +328,6 @@ msgstr "پرونده ها در حال بازرسی هستند لطفا صبر ک
 msgid "Current scanning"
 msgstr "بازرسی کنونی"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "پوشه"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "پوشه ها"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "پرونده"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "پرونده ها"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "بهبود فایل سیستمی ذخیره گاه..."
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 9ca82320bcc4e946b2b7690ae70ab11117152e65..56d1039db0f0e150e1d3800d6269628ad57a6776 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Jiri Grönroos <jiri.gronroos@iki.fi>, 2013
+# ioxo <vahakangas@gmail.com>, 2013
 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:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -23,6 +24,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s jakoi kohteen »%s« kanssasi"
 
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr "Siirrytty ylläpitotilaan"
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr "Ylläpitotila laitettu pois päältä"
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr "Tietokanta ajan tasalla"
+
+#: ajax/update.php:20
+msgid "Updating filecache, this may take really long..."
+msgstr "Päivitetään tiedostojen välimuistia, tämä saattaa kestää todella kauan..."
+
+#: ajax/update.php:23
+msgid "Updated filecache"
+msgstr "Tiedostojen välimuisti päivitetty"
+
+#: ajax/update.php:26
+#, php-format
+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."
@@ -194,23 +224,23 @@ msgstr "viime vuonna"
 msgid "years ago"
 msgstr "vuotta sitten"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Valitse"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Kyllä"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Ei"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Ok"
 
@@ -313,7 +343,7 @@ msgstr "Jakaminen uudelleen ei ole salittu"
 
 #: js/share.js:317
 msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "{item} on jaettu {user} kanssa"
 
 #: js/share.js:338
 msgid "Unshare"
@@ -377,7 +407,7 @@ msgstr "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi."
 #: lostpassword/controller.php:61
 #, php-format
 msgid "%s password reset"
-msgstr ""
+msgstr "%s salasanan nollaus"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -443,7 +473,7 @@ msgstr "Henkilökohtainen"
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Sovellukset"
 
@@ -576,10 +606,6 @@ msgstr "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan."
 msgid "Log out"
 msgstr "Kirjaudu ulos"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Lisää sovelluksia"
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automaattinen sisäänkirjautuminen hylättiin!"
@@ -594,19 +620,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Unohditko salasanasi?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "muista"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Kirjaudu sisään"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Vaihtoehtoiset kirjautumiset"
 
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index dcf22e09ae1335e336a65c492d643aa1cb1ec7f2..69f2485ac908d98f8c40aff14aaf4331c01596d1 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +75,11 @@ msgstr "Levylle kirjoitus epäonnistui"
 msgid "Not enough storage available"
 msgstr "Tallennustilaa ei ole riittävästi käytettävissä"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Virheellinen kansio."
 
@@ -95,21 +99,20 @@ msgstr "Tilaa ei ole riittävästi"
 msgid "Upload cancelled."
 msgstr "Lähetys peruttu."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "Verkko-osoite ei voi olla tyhjä"
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Virhe"
 
@@ -125,41 +128,57 @@ msgstr "Poista pysyvästi"
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Odottaa"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} on jo olemassa"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "korvaa"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "ehdota nimeä"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "peru"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "kumoa"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n kansio"
+msgstr[1] "%n kansiota"
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n tiedosto"
+msgstr[1] "%n tiedostoa"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Lähetetään %n tiedosto"
 msgstr[1] "Lähetetään %n tiedostoa"
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -197,34 +216,18 @@ msgid ""
 "big."
 msgstr "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Koko"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Muokattu"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n kansio"
-msgstr[1] "%n kansiota"
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n tiedosto"
-msgstr[1] "%n tiedostoa"
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -328,22 +331,6 @@ msgstr "Tiedostoja tarkistetaan, odota hetki."
 msgid "Current scanning"
 msgstr "Tämänhetkinen tutkinta"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "kansio"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "kansiota"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "tiedosto"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "tiedostoa"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Päivitetään tiedostojärjestelmän välimuistia..."
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index 764424f6b3f2f40b7a3ec4cc5f7ac0bbb3f3f9cc..fcd9edec0e477412c282d3f62277e09b5bf34fbd 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-26 06:20+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "Sovellusta \"%s\" ei voi asentaa, koska se ei ole yhteensopiva käytössä olevan ownCloud-version kanssa."
 
 #: app.php:250
 msgid "No app name specified"
@@ -87,7 +87,7 @@ msgstr ""
 
 #: installer.php:63
 msgid "No source specified when installing app"
-msgstr ""
+msgstr "Lähdettä ei määritelty sovellusta asennettaessa"
 
 #: installer.php:70
 msgid "No href specified when installing app from http"
@@ -95,12 +95,12 @@ msgstr ""
 
 #: installer.php:75
 msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Polkua ei määritelty sovellusta asennettaessa paikallisesta tiedostosta"
 
 #: installer.php:89
 #, php-format
 msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Tyypin %s arkistot eivät ole tuettuja"
 
 #: installer.php:103
 msgid "Failed to open archive when installing app"
@@ -108,7 +108,7 @@ msgstr ""
 
 #: installer.php:123
 msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "Sovellus ei sisällä info.xml-tiedostoa"
 
 #: installer.php:129
 msgid "App can't be installed because of not allowed code in the App"
@@ -134,12 +134,12 @@ msgstr ""
 
 #: installer.php:160
 msgid "App directory already exists"
-msgstr ""
+msgstr "Sovelluskansio on jo olemassa"
 
 #: installer.php:173
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Sovelluskansion luominen ei onnistu. Korjaa käyttöoikeudet. %s"
 
 #: json.php:28
 msgid "Application is not enabled"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index d104af4d8861934b0dd11b2ff7bba8ec2822ee7a..92f6acfd299cc84a429752e8192e3a8b353fc6ce 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-26 06:20+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -103,11 +103,11 @@ msgstr "Odota hetki..."
 
 #: js/apps.js:71 js/apps.js:72 js/apps.js:92
 msgid "Error while disabling app"
-msgstr ""
+msgstr "Virhe poistaessa sovellusta käytöstä"
 
 #: js/apps.js:91 js/apps.js:104 js/apps.js:105
 msgid "Error while enabling app"
-msgstr ""
+msgstr "Virhe ottaessa sovellusta käyttöön"
 
 #: js/apps.js:115
 msgid "Updating...."
@@ -208,7 +208,7 @@ msgstr ""
 #: templates/admin.php:33
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr ""
+msgstr "Lue <a href=\"%s\">asennusohjeet</a> tarkasti."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
@@ -319,7 +319,7 @@ msgstr "Pakota HTTPS"
 #: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr ""
+msgstr "Pakottaa asiakasohjelmistot ottamaan yhteyden %siin salatun yhteyden kautta."
 
 #: templates/admin.php:191
 #, php-format
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index b5e48526b0a3b3cb6d6e914c4cb447ab1a95aa63..5aaca8e3f707f8676ae68ddb982adb6f011aa5ee 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -27,6 +27,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s partagé »%s« avec vous"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Type de catégorie non spécifié."
@@ -198,23 +227,23 @@ msgstr "l'année dernière"
 msgid "years ago"
 msgstr "il y a plusieurs années"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Choisir"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "Erreur de chargement du modèle du sélecteur de fichier"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Oui"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Non"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Ok"
 
@@ -447,7 +476,7 @@ msgstr "Personnel"
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Applications"
 
@@ -580,10 +609,6 @@ msgstr "%s est disponible. Obtenez plus d'informations sur la façon de mettre 
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Connexion automatique rejetée !"
@@ -598,19 +623,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Mot de passe perdu ?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "se souvenir de moi"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Connexion"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Logins alternatifs"
 
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 175956137dc0fe03fc2e415b0adc245a02c6b5e1..bd1b9b97978c8e411ebf8ff52cabe2501b015594 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -77,7 +77,11 @@ msgstr "Erreur d'écriture sur le disque"
 msgid "Not enough storage available"
 msgstr "Plus assez d'espace de stockage disponible"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Dossier invalide."
 
@@ -97,21 +101,20 @@ msgstr "Espace disponible insuffisant"
 msgid "Upload cancelled."
 msgstr "Envoi annulé."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "L'URL ne peut-être vide"
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 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:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Erreur"
 
@@ -127,41 +130,57 @@ msgstr "Supprimer de façon définitive"
 msgid "Rename"
 msgstr "Renommer"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "En attente"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} existe déjà"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "remplacer"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "Suggérer un nom"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "annuler"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} a été remplacé par {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "annuler"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "fichiers en cours d'envoi"
 
@@ -199,34 +218,18 @@ msgid ""
 "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:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Taille"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Modifié"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -330,22 +333,6 @@ msgstr "Les fichiers sont en cours d'analyse, veuillez patienter."
 msgid "Current scanning"
 msgstr "Analyse en cours"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "dossier"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "dossiers"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fichier"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "fichiers"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Mise à niveau du cache du système de fichier"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 50cf7e0e18d2e8a613723425040e72aa45d10489..ed5c0b1b0912493112bce20dd22daccb5ebc7692 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -23,6 +23,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s compartiu «%s» con vostede"
 
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr "Modo de mantemento activado"
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr "Modo de mantemento desactivado"
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr "Base de datos actualizada"
+
+#: ajax/update.php:20
+msgid "Updating filecache, this may take really long..."
+msgstr "Actualizando o ficheiro da caché, isto pode levar bastante tempo..."
+
+#: ajax/update.php:23
+msgid "Updated filecache"
+msgstr "Ficheiro da caché actualizado"
+
+#: ajax/update.php:26
+#, php-format
+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"
@@ -194,23 +223,23 @@ msgstr "último ano"
 msgid "years ago"
 msgstr "anos atrás"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Escoller"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "Produciuse un erro ao cargar o modelo do selector de ficheiros"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Si"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Non"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Aceptar"
 
@@ -443,7 +472,7 @@ msgstr "Persoal"
 msgid "Users"
 msgstr "Usuarios"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Aplicativos"
 
@@ -576,10 +605,6 @@ msgstr "%s está dispoñíbel. Obteña máis información sobre como actualizar.
 msgid "Log out"
 msgstr "Desconectar"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Máis aplicativos"
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Rexeitouse a entrada automática"
@@ -594,19 +619,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Perdeu o contrasinal?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "lembrar"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Conectar"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Accesos alternativos"
 
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 70312ce0d910ec98f3c2ecc9ee2861053ac00a80..f655969e064b30d775d200ff25c88695d51127ef 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/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-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-20 11:10+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -75,7 +75,11 @@ msgstr "Produciuse un erro ao escribir no disco"
 msgid "Not enough storage available"
 msgstr "Non hai espazo de almacenamento abondo"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "O directorio é incorrecto."
 
@@ -95,21 +99,20 @@ msgstr "O espazo dispoñíbel é insuficiente"
 msgid "Upload cancelled."
 msgstr "Envío cancelado."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:234 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "O URL non pode quedar baleiro."
 
-#: js/file-upload.js:239 lib/app.php:53
+#: js/file-upload.js:244 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:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Erro"
 
@@ -125,41 +128,57 @@ msgstr "Eliminar permanentemente"
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Pendentes"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "Xa existe un {new_name}"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "substituír"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "suxerir nome"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "substituír {new_name} por {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "desfacer"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n cartafol"
+msgstr[1] "%n cartafoles"
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n ficheiro"
+msgstr[1] "%n ficheiros"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Cargando %n ficheiro"
 msgstr[1] "Cargando %n ficheiros"
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "ficheiros enviándose"
 
@@ -197,34 +216,18 @@ msgid ""
 "big."
 msgstr "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Nome de cartafol incorrecto. O uso de «Shared» está reservado por Owncloud"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n cartafol"
-msgstr[1] "%n cartafoles"
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n ficheiro"
-msgstr[1] "%n ficheiros"
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -328,22 +331,6 @@ msgstr "Estanse analizando os ficheiros. Agarde."
 msgid "Current scanning"
 msgstr "Análise actual"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "directorio"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "directorios"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "ficheiro"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "ficheiros"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Anovando a caché do sistema de ficheiros..."
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index 08a5c6653919e8d2b90133bee055950e2604eb8c..48006ace76f0e23f11dac291aa21eb559188526e 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-30 09:33-0400\n"
+"PO-Revision-Date: 2013-08-29 08:30+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,11 +23,11 @@ msgstr ""
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "Non é posíbel instalar o aplicativo «%s» por non seren compatíbel  con esta versión do ownCloud."
 
 #: app.php:250
 msgid "No app name specified"
-msgstr ""
+msgstr "Non se especificou o nome do aplicativo"
 
 #: app.php:361
 msgid "Help"
@@ -87,59 +87,59 @@ msgstr "Descargue os ficheiros en cachos máis pequenos e por separado, ou pída
 
 #: installer.php:63
 msgid "No source specified when installing app"
-msgstr ""
+msgstr "Non foi especificada ningunha orixe ao instalar aplicativos"
 
 #: installer.php:70
 msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Non foi especificada ningunha href ao instalar aplicativos"
 
 #: installer.php:75
 msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Non foi especificada ningunha ruta ao instalar aplicativos desde un ficheiro local"
 
 #: installer.php:89
 #, php-format
 msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Os arquivos do tipo %s non están admitidos"
 
 #: installer.php:103
 msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Non foi posíbel abrir o arquivo ao instalar aplicativos"
 
 #: installer.php:123
 msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "O aplicativo non fornece un ficheiro info.xml"
 
 #: installer.php:129
 msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Non é posíbel instalar o aplicativo por mor de conter código non permitido"
 
 #: installer.php:138
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
-msgstr ""
+msgstr "Non é posíbel instalar o aplicativo por non seren compatíbel  con esta versión do ownCloud."
 
 #: installer.php:144
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
-msgstr ""
+msgstr "Non é posíbel instalar o aplicativo por conter a etiqueta\n<shipped>\n\ntrue\n</shipped>\nque non está permitida para os aplicativos non enviados"
 
 #: installer.php:150
 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 ""
+msgstr "Non é posíbel instalar o aplicativo xa que a versión en info.xml/version non é a mesma que a versión informada desde a App Store"
 
 #: installer.php:160
 msgid "App directory already exists"
-msgstr ""
+msgstr "Xa existe o directorio do aplicativo"
 
 #: installer.php:173
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Non é posíbel crear o cartafol de aplicativos. Corrixa os permisos. %s"
 
 #: json.php:28
 msgid "Application is not enabled"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index fda92370b3369ed2354565e14adcd21875e40a78..e04bf9e31b2c1a5b1d1706a6c9c9693f1b689a58 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-30 09:33-0400\n"
+"PO-Revision-Date: 2013-08-28 22:30+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -85,47 +85,47 @@ msgstr "Non é posíbel eliminar o usuario do grupo %s"
 msgid "Couldn't update app."
 msgstr "Non foi posíbel actualizar o aplicativo."
 
-#: js/apps.js:35
+#: js/apps.js:43
 msgid "Update to {appversion}"
 msgstr "Actualizar á {appversion}"
 
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
 msgid "Disable"
 msgstr "Desactivar"
 
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
 msgid "Enable"
 msgstr "Activar"
 
-#: js/apps.js:63
+#: js/apps.js:71
 msgid "Please wait...."
 msgstr "Agarde..."
 
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
 msgid "Error while disabling app"
-msgstr ""
+msgstr "Produciuse un erro ao desactivar o aplicativo"
 
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
 msgid "Error while enabling app"
-msgstr ""
+msgstr "Produciuse un erro ao activar o aplicativo"
 
-#: js/apps.js:115
+#: js/apps.js:123
 msgid "Updating...."
 msgstr "Actualizando..."
 
-#: js/apps.js:118
+#: js/apps.js:126
 msgid "Error while updating app"
 msgstr "Produciuse un erro mentres actualizaba o aplicativo"
 
-#: js/apps.js:118
+#: js/apps.js:126
 msgid "Error"
 msgstr "Erro"
 
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
 msgid "Update"
 msgstr "Actualizar"
 
-#: js/apps.js:122
+#: js/apps.js:130
 msgid "Updated"
 msgstr "Actualizado"
 
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 53f3aae44a7fcc3cc71848ec5bec16771eca5a31..ccf747517c2bf6fbcb98ead60e7242cf3f829678 100644
--- a/l10n/he/core.po
+++ b/l10n/he/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-08-23 20:16-0400\n"
-"PO-Revision-Date: 2013-08-22 15:40+0000\n"
-"Last-Translator: gilshwartz\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,6 +24,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s שיתף/שיתפה איתך את »%s«"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "סוג הקטגוריה לא סופק."
@@ -444,7 +473,7 @@ msgstr "אישי"
 msgid "Users"
 msgstr "משתמשים"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "יישומים"
 
@@ -577,10 +606,6 @@ msgstr "%s זמינה להורדה. ניתן ללחוץ כדי לקבל מידע
 msgid "Log out"
 msgstr "התנתקות"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "יישומים נוספים"
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "בקשת הכניסה האוטומטית נדחתה!"
@@ -595,19 +620,19 @@ msgstr "אם לא שינית את ססמתך לאחרונה, יתכן שחשבו
 msgid "Please change your password to secure your account again."
 msgstr "נא לשנות את הססמה שלך כדי לאבטח את חשבונך מחדש."
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "שכחת את ססמתך?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "שמירת הססמה"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "כניסה"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "כניסות אלטרנטיביות"
 
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 1b7e785ebf1f85f9a5faba74920d16758d760d2d..9002e898ceb5057463876b7213bab888fec364bd 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +75,11 @@ msgstr "הכתיבה לכונן נכשלה"
 msgid "Not enough storage available"
 msgstr "אין די שטח פנוי באחסון"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "תיקייה שגויה."
 
@@ -95,21 +99,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr "ההעלאה בוטלה."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה."
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "קישור אינו יכול להיות ריק."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "שגיאה"
 
@@ -125,41 +128,57 @@ msgstr "מחק לצמיתות"
 msgid "Rename"
 msgstr "שינוי שם"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "ממתין"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} כבר קיים"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "החלפה"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "הצעת שם"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "ביטול"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} הוחלף ב־{old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "ביטול"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "קבצים בהעלאה"
 
@@ -197,34 +216,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "שם"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "גודל"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "זמן שינוי"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -328,22 +331,6 @@ msgstr "הקבצים נסרקים, נא להמתין."
 msgid "Current scanning"
 msgstr "הסריקה הנוכחית"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "קובץ"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "קבצים"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index 27c6e564ae45cd0ee33e34d1d3145e4406f6c227..479e61d7c60deeb6b65da57960166ecc4740b789 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -23,6 +23,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -194,23 +223,23 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr ""
 
@@ -443,7 +472,7 @@ msgstr "यक्तिगत"
 msgid "Users"
 msgstr "उपयोगकर्ता"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Apps"
 
@@ -576,10 +605,6 @@ msgstr ""
 msgid "Log out"
 msgstr "लोग  आउट"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -594,19 +619,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "याद रखें"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index f3bce0ac149d31bdb3ac266e4512ec1f9808c4df..67aa5d887df0bfbc1ef2a059450500b857ec1e7c 100644
--- a/l10n/hi/files.po
+++ b/l10n/hi/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -74,7 +74,11 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "त्रुटि"
 
@@ -124,41 +127,57 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -196,34 +215,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -327,22 +330,6 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index fc513b2f6851b515059079db59d25c476e08a457..693dc056589bad46edd92bf388112e9a985c4aba 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -197,23 +226,23 @@ msgstr "prošlu godinu"
 msgid "years ago"
 msgstr "godina"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Izaberi"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Da"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Ne"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "U redu"
 
@@ -446,7 +475,7 @@ msgstr "Osobno"
 msgid "Users"
 msgstr "Korisnici"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Aplikacije"
 
@@ -579,10 +608,6 @@ msgstr ""
 msgid "Log out"
 msgstr "Odjava"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -597,19 +622,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Izgubili ste lozinku?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "zapamtiti"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Prijava"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index b15680bceff829a52a528e4f4d07f245b0735b81..b576a0b7cb1e9329040a5314252b4f94ad0ada5c 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +74,11 @@ msgstr "Neuspjelo pisanje na disk"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr "Slanje poništeno."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Greška"
 
@@ -124,42 +127,60 @@ msgstr ""
 msgid "Rename"
 msgstr "Promjeni ime"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "U tijeku"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "zamjeni"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "predloži ime"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "odustani"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "vrati"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "datoteke se učitavaju"
 
@@ -197,36 +218,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Zadnja promjena"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -330,22 +333,6 @@ msgstr "Datoteke se skeniraju, molimo pričekajte."
 msgid "Current scanning"
 msgstr "Trenutno skeniranje"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "datoteka"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "datoteke"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 715adea419fe0437d2141e4e930dff89cae44254..85a6b3a0d1d51a435c31f21446389b06df5c01ce 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s megosztotta Önnel ezt:  »%s«"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Nincs megadva a kategória típusa."
@@ -195,23 +224,23 @@ msgstr "tavaly"
 msgid "years ago"
 msgstr "több éve"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Válasszon"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "Nem sikerült betölteni a fájlkiválasztó sablont"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Igen"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Nem"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Ok"
 
@@ -444,7 +473,7 @@ msgstr "Személyes"
 msgid "Users"
 msgstr "Felhasználók"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Alkalmazások"
 
@@ -577,10 +606,6 @@ msgstr "%s rendelkezésre áll. További információ a frissítéshez."
 msgid "Log out"
 msgstr "Kilépés"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Az automatikus bejelentkezés sikertelen!"
@@ -595,19 +620,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Elfelejtette a jelszavát?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "emlékezzen"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Bejelentkezés"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Alternatív bejelentkezés"
 
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index cc2316c691ed960bb11d5176a1eac39f30f1ab4b..48876d9d474697e24615a303eeb6cf48f943a78e 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +75,11 @@ 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:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Érvénytelen mappa."
 
@@ -95,21 +99,20 @@ msgstr "Nincs elég szabad hely"
 msgid "Upload cancelled."
 msgstr "A feltöltést megszakítottuk."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "Az URL nem lehet semmi."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 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:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Hiba"
 
@@ -125,41 +128,57 @@ msgstr "Végleges törlés"
 msgid "Rename"
 msgstr "Átnevezés"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Folyamatban"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} már létezik"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "írjuk fölül"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "legyen más neve"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "mégse"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} fájlt kicseréltük ezzel:  {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "visszavonás"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "fájl töltődik föl"
 
@@ -197,34 +216,18 @@ msgid ""
 "big."
 msgstr "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Érvénytelen mappanév. A név használata csak a Owncloud számára lehetséges."
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Név"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Méret"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Módosítva"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -328,22 +331,6 @@ msgstr "A fájllista ellenőrzése zajlik, kis türelmet!"
 msgid "Current scanning"
 msgstr "Ellenőrzés alatt"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "mappa"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "mappa"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fájl"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "fájlok"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "A fájlrendszer gyorsítótárának frissítése zajlik..."
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index e2aceb5731c0f2604cc4fa7f0761a6adc4daf229..9d22bb2fd79f4e51a41823d3a382e9c36745cbd7 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -193,23 +222,23 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr ""
 
@@ -442,7 +471,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr ""
 
@@ -575,10 +604,6 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -593,19 +618,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index 4769f28713cd14a297b84b099ad0c1cac6fd5ade..6c477202b4d2ed0f6099f8f3963ece55c3873eac 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -74,7 +74,11 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr ""
 
@@ -124,41 +127,57 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -196,34 +215,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -327,22 +330,6 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 901f047607084b6d7d4f0217f36da0203edb10f9..7dfa76c49ea51d844f9d87f3d257bc174f8e85d3 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -193,23 +222,23 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr ""
 
@@ -442,7 +471,7 @@ msgstr "Personal"
 msgid "Users"
 msgstr "Usatores"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Applicationes"
 
@@ -575,10 +604,6 @@ msgstr ""
 msgid "Log out"
 msgstr "Clauder le session"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -593,19 +618,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Tu perdeva le contrasigno?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "memora"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Aperir session"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 0ef13b548390a341d1061df2e5172d59c2a68cf0..97ce4fab714639a3350208b52bf6a9c1bf3cc697 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +74,11 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Error"
 
@@ -124,41 +127,57 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -196,34 +215,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Nomine"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Dimension"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Modificate"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -327,22 +330,6 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/id/core.po b/l10n/id/core.po
index abd8fc9cd4dd4de455730f632c72f3c69e91d2a0..51d44b0f572923da345974e0a1ad5b822643a8e5 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Tipe kategori tidak diberikan."
@@ -189,23 +218,23 @@ msgstr "tahun kemarin"
 msgid "years ago"
 msgstr "beberapa tahun lalu"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Pilih"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Ya"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Tidak"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Oke"
 
@@ -438,7 +467,7 @@ msgstr "Pribadi"
 msgid "Users"
 msgstr "Pengguna"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Aplikasi"
 
@@ -571,10 +600,6 @@ msgstr ""
 msgid "Log out"
 msgstr "Keluar"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Masuk otomatis ditolak!"
@@ -589,19 +614,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Lupa sandi?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "selalu masuk"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Masuk"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Cara Alternatif untuk Masuk"
 
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 2afa9512605caca5921702b0c24606040d88b9d4..5d512ec38db9acc3e8908d9798870bfc2861b881 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +74,11 @@ msgstr "Gagal menulis ke disk"
 msgid "Not enough storage available"
 msgstr "Ruang penyimpanan tidak mencukupi"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Direktori tidak valid."
 
@@ -94,21 +98,20 @@ msgstr "Ruang penyimpanan tidak mencukupi"
 msgid "Upload cancelled."
 msgstr "Pengunggahan dibatalkan."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL tidak boleh kosong"
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Galat"
 
@@ -124,40 +127,54 @@ msgstr "Hapus secara permanen"
 msgid "Rename"
 msgstr "Ubah nama"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Menunggu"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} sudah ada"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "ganti"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "sarankan nama"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "batalkan"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "mengganti {new_name} dengan {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "urungkan"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "berkas diunggah"
 
@@ -195,32 +212,18 @@ msgid ""
 "big."
 msgstr "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Nama folder salah. Nama 'Shared' telah digunakan oleh Owncloud."
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Ukuran"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -324,22 +327,6 @@ msgstr "Berkas sedang dipindai, silakan tunggu."
 msgid "Current scanning"
 msgstr "Yang sedang dipindai"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "berkas"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "berkas-berkas"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Meningkatkan tembolok sistem berkas..."
diff --git a/l10n/is/core.po b/l10n/is/core.po
index 875e468f20aa8f368b33f4db114bc123d69ed6a8..643a8c16821bdb08e1841066b4e5879dcdae9e62 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -23,6 +23,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Flokkur ekki gefin"
@@ -194,23 +223,23 @@ msgstr "síðasta ári"
 msgid "years ago"
 msgstr "einhverjum árum"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Veldu"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Já"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Nei"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Í lagi"
 
@@ -443,7 +472,7 @@ msgstr "Um mig"
 msgid "Users"
 msgstr "Notendur"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Forrit"
 
@@ -576,10 +605,6 @@ msgstr "%s er til boða. Fáðu meiri upplýsingar um hvernig þú uppfærir."
 msgid "Log out"
 msgstr "Útskrá"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Sjálfvirkri innskráningu hafnað!"
@@ -594,19 +619,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Týndir þú lykilorðinu?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "muna eftir mér"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "<strong>Skrá inn</strong>"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/is/files.po b/l10n/is/files.po
index 0cc47cc22299411fac3b5465086f726467dfecfa..10e1d535f4035cc8ada6fa2723a6a82da99b0456 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +74,11 @@ msgstr "Tókst ekki að skrifa á disk"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Ógild mappa."
 
@@ -94,21 +98,20 @@ msgstr "Ekki nægt pláss tiltækt"
 msgid "Upload cancelled."
 msgstr "Hætt við innsendingu."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "Vefslóð má ekki vera tóm."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Villa"
 
@@ -124,41 +127,57 @@ msgstr ""
 msgid "Rename"
 msgstr "Endurskýra"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Bíður"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} er þegar til"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "yfirskrifa"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "stinga upp á nafni"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "hætta við"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "yfirskrifaði {new_name} með {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "afturkalla"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -196,34 +215,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Óleyfilegt nafn á möppu. Nafnið 'Shared' er frátekið fyrir Owncloud"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Nafn"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Stærð"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Breytt"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -327,22 +330,6 @@ msgstr "Verið er að skima skrár, vinsamlegast hinkraðu."
 msgid "Current scanning"
 msgstr "Er að skima"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/it/core.po b/l10n/it/core.po
index c34b608c15696fed6fa34dc3aa4a7a3cf68422b1..9a45ffabc38618c84cec9d0746a8b2992b4c4539 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 06:50+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -25,6 +25,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s ha condiviso «%s» con te"
 
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr "Modalità di manutenzione attivata"
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr "Modalità di manutenzione disattivata"
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr "Database aggiornato"
+
+#: ajax/update.php:20
+msgid "Updating filecache, this may take really long..."
+msgstr "Aggiornamento della cache dei file in corso, potrebbe richiedere molto tempo..."
+
+#: ajax/update.php:23
+msgid "Updated filecache"
+msgstr "Cache dei file aggiornata"
+
+#: ajax/update.php:26
+#, php-format
+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."
@@ -445,7 +474,7 @@ msgstr "Personale"
 msgid "Users"
 msgstr "Utenti"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Applicazioni"
 
@@ -578,10 +607,6 @@ msgstr "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento."
 msgid "Log out"
 msgstr "Esci"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Altre applicazioni"
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Accesso automatico rifiutato."
@@ -596,19 +621,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Hai perso la password?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "ricorda"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Accedi"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Accessi alternativi"
 
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 8196aed34521d92b172452c9697f79a44ad28dff..6b88648425a7551009ef0fd08596857fe08d2de0 100644
--- a/l10n/it/files.po
+++ b/l10n/it/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 06:50+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -76,7 +76,11 @@ msgstr "Scrittura su disco non riuscita"
 msgid "Not enough storage available"
 msgstr "Spazio di archiviazione insufficiente"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Cartella non valida."
 
@@ -96,21 +100,20 @@ msgstr "Spazio disponibile insufficiente"
 msgid "Upload cancelled."
 msgstr "Invio annullato"
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:234 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "L'URL non può essere vuoto."
 
-#: js/file-upload.js:239 lib/app.php:53
+#: js/file-upload.js:244 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:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Errore"
 
@@ -126,41 +129,57 @@ msgstr "Elimina definitivamente"
 msgid "Rename"
 msgstr "Rinomina"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "In corso"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} esiste già"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "sostituisci"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "suggerisci nome"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "annulla"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "sostituito {new_name} con {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "annulla"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n cartella"
+msgstr[1] "%n cartelle"
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n file"
+msgstr[1] "%n file"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Caricamento di %n file in corso"
 msgstr[1] "Caricamento di %n file in corso"
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "caricamento file"
 
@@ -198,34 +217,18 @@ msgid ""
 "big."
 msgstr "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Nome della cartella non valido. L'uso di 'Shared' è riservato da ownCloud"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Dimensione"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Modificato"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n cartella"
-msgstr[1] "%n cartelle"
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n file"
-msgstr[1] "%n file"
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -329,22 +332,6 @@ msgstr "Scansione dei file in corso, attendi"
 msgid "Current scanning"
 msgstr "Scansione corrente"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "cartella"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "cartelle"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "file"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "file"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Aggiornamento della cache del filesystem in corso..."
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index 84dacdb52d2104697de4d695eb447525d231decb..e119006c71ecba4caa9980e2511a88f8fda6f718 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-30 09:33-0400\n"
+"PO-Revision-Date: 2013-08-29 19:30+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,11 +24,11 @@ msgstr ""
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "L'applicazione \"%s\" non può essere installata poiché non è compatibile con questa versione di ownCloud."
 
 #: app.php:250
 msgid "No app name specified"
-msgstr ""
+msgstr "Il nome dell'applicazione non è specificato"
 
 #: app.php:361
 msgid "Help"
@@ -88,38 +88,38 @@ msgstr "Scarica i file in blocchi più piccoli, separatamente o chiedi al tuo am
 
 #: installer.php:63
 msgid "No source specified when installing app"
-msgstr ""
+msgstr "Nessuna fonte specificata durante l'installazione dell'applicazione"
 
 #: installer.php:70
 msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Nessun href specificato durante l'installazione dell'applicazione da http"
 
 #: installer.php:75
 msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Nessun percorso specificato durante l'installazione dell'applicazione da file locale"
 
 #: installer.php:89
 #, php-format
 msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Gli archivi di tipo %s non sono supportati"
 
 #: installer.php:103
 msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Apertura archivio non riuscita durante l'installazione dell'applicazione"
 
 #: installer.php:123
 msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "L'applicazione non fornisce un file info.xml"
 
 #: installer.php:129
 msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "L'applicazione non può essere installata a causa di codice non consentito al suo interno"
 
 #: installer.php:138
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
-msgstr ""
+msgstr "L'applicazione non può essere installata poiché non è compatibile con questa versione di ownCloud"
 
 #: installer.php:144
 msgid ""
@@ -131,16 +131,16 @@ msgstr ""
 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 ""
+msgstr "L'applicazione non può essere installata poiché la versione in info.xml/version non è la stessa riportata dall'app store"
 
 #: installer.php:160
 msgid "App directory already exists"
-msgstr ""
+msgstr "La cartella dell'applicazione esiste già"
 
 #: installer.php:173
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Impossibile creare la cartella dell'applicazione. Correggi i permessi. %s"
 
 #: json.php:28
 msgid "Application is not enabled"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index 93d6745203d47dd840953d5e325f6f8053e0b965..7effb5774b632458233386d9b6c226e9a457bbe0 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -26,6 +26,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%sが あなたと »%s«を共有しました"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "カテゴリタイプは提供されていません。"
@@ -193,23 +222,23 @@ msgstr "一年前"
 msgid "years ago"
 msgstr "年前"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "選択"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "ファイルピッカーのテンプレートの読み込みエラー"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "はい"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "いいえ"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "OK"
 
@@ -442,7 +471,7 @@ msgstr "個人"
 msgid "Users"
 msgstr "ユーザ"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "アプリ"
 
@@ -575,10 +604,6 @@ msgstr "%s が利用可能です。更新方法に関してさらに情報を取
 msgid "Log out"
 msgstr "ログアウト"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "他のアプリ"
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "自動ログインは拒否されました！"
@@ -593,19 +618,19 @@ msgstr "最近パスワードを変更していない場合、あなたのアカ
 msgid "Please change your password to secure your account again."
 msgstr "アカウント保護の為、パスワードを再度の変更をお願いいたします。"
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "パスワードを忘れましたか？"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "パスワードを記憶する"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "ログイン"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "代替ログイン"
 
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index e27df447a18661917cdd75d85fcbf15077e82661..b8591173f308a45d5c870f5c9f064c3a566c64dd 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-20 09:00+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -79,7 +79,11 @@ msgstr "ディスクへの書き込みに失敗しました"
 msgid "Not enough storage available"
 msgstr "ストレージに十分な空き容量がありません"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "無効なディレクトリです。"
 
@@ -99,21 +103,20 @@ msgstr "利用可能なスペースが十分にありません"
 msgid "Upload cancelled."
 msgstr "アップロードはキャンセルされました。"
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。"
 
-#: js/file-upload.js:234 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URLは空にできません。"
 
-#: js/file-upload.js:239 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "無効なフォルダ名です。'Shared' の利用はownCloudで予約済みです"
 
-#: js/file-upload.js:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "エラー"
 
@@ -129,40 +132,54 @@ msgstr "完全に削除する"
 msgid "Rename"
 msgstr "名前の変更"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "中断"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} はすでに存在しています"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "置き換え"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "推奨名称"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "キャンセル"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} を {new_name} に置換"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "元に戻す"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n個のフォルダ"
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n個のファイル"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n 個のファイルをアップロード中"
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "ファイルをアップロード中"
 
@@ -200,32 +217,18 @@ msgid ""
 "big."
 msgstr "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。"
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "無効なフォルダ名です。'Shared' の利用は ownCloud が予約済みです。"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "名前"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "サイズ"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "変更"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n個のフォルダ"
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n個のファイル"
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -329,22 +332,6 @@ msgstr "ファイルをスキャンしています、しばらくお待ちくだ
 msgid "Current scanning"
 msgstr "スキャン中"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "ディレクトリ"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "ディレクトリ"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "ファイル"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "ファイル"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "ファイルシステムキャッシュを更新中..."
diff --git a/l10n/ka/core.po b/l10n/ka/core.po
index 16224d9194629101b1fd8cc2e80697dd48ceb6a4..d8e95837373a9b4105bf975574a277e094bb54d2 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -189,23 +218,23 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr ""
 
@@ -438,7 +467,7 @@ msgstr "პერსონა"
 msgid "Users"
 msgstr "მომხმარებლები"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr ""
 
@@ -571,10 +600,6 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -589,19 +614,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ka/files.po b/l10n/ka/files.po
index 0ba377534ee6d0e0cdc4097dd5b693644843ca6b..8189ecec47028ccd45a988dc48215b1a5ac43dda 100644
--- a/l10n/ka/files.po
+++ b/l10n/ka/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -74,7 +74,11 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr ""
 
@@ -124,40 +127,54 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -195,32 +212,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -324,22 +327,6 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index 13d2a8bc9872f04e9090655d9d46c34d04c120bb..5611a4679578781f11903e9be6d9d6edd3cc4f87 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "კატეგორიის ტიპი არ არის განხილული."
@@ -189,23 +218,23 @@ msgstr "ბოლო წელს"
 msgid "years ago"
 msgstr "წლის წინ"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "არჩევა"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "კი"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "არა"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "დიახ"
 
@@ -438,7 +467,7 @@ msgstr "პირადი"
 msgid "Users"
 msgstr "მომხმარებელი"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "აპლიკაციები"
 
@@ -571,10 +600,6 @@ msgstr ""
 msgid "Log out"
 msgstr "გამოსვლა"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "ავტომატური შესვლა უარყოფილია!"
@@ -589,19 +614,19 @@ msgstr "თუ თქვენ არ შეცვლით პაროლს,
 msgid "Please change your password to secure your account again."
 msgstr "გთხოვთ შეცვალოთ თქვენი პაროლი, თქვენი ანგარიშის დასაცავად."
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "დაგავიწყდათ პაროლი?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "დამახსოვრება"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "შესვლა"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "ალტერნატიული Login–ი"
 
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index 1706eb1ccddc34d8b612fefffc4c56333930aa49..b162233b9c0e2d70541eea72de7429cdb97973d7 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +74,11 @@ msgstr "შეცდომა დისკზე ჩაწერისას"
 msgid "Not enough storage available"
 msgstr "საცავში საკმარისი ადგილი არ არის"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "დაუშვებელი დირექტორია."
 
@@ -94,21 +98,20 @@ msgstr "საკმარისი ადგილი არ არის"
 msgid "Upload cancelled."
 msgstr "ატვირთვა შეჩერებულ იქნა."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას"
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL არ შეიძლება იყოს ცარიელი."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "შეცდომა"
 
@@ -124,40 +127,54 @@ msgstr "სრულად წაშლა"
 msgid "Rename"
 msgstr "გადარქმევა"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "მოცდის რეჟიმში"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} უკვე არსებობს"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "შეცვლა"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "სახელის შემოთავაზება"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "უარყოფა"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} შეცვლილია {old_name}–ით"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "დაბრუნება"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "ფაილები იტვირთება"
 
@@ -195,32 +212,18 @@ msgid ""
 "big."
 msgstr "გადმოწერის მოთხოვნა მუშავდება. ის მოითხოვს გარკვეულ დროს რაგდან ფაილები არის დიდი ზომის."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "დაუშვებელი ფოლდერის სახელი.  'Shared'–ის გამოყენება რეზერვირებულია Owncloud–ის მიერ"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "სახელი"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "ზომა"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "შეცვლილია"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -324,22 +327,6 @@ msgstr "მიმდინარეობს ფაილების სკა
 msgid "Current scanning"
 msgstr "მიმდინარე სკანირება"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "ფაილური სისტემის ქეშის განახლება...."
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
index 1ebb511ac38a39d0593c72830f8fa5001dd25f8a..7e2f5e0cca270f8552baf08aa5a1936a4d5c322f 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -189,23 +218,23 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr ""
 
@@ -438,7 +467,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr ""
 
@@ -571,10 +600,6 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -589,19 +614,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/kn/files.po b/l10n/kn/files.po
index 810fccb7bf66154ae48f855ae9b370c2870700c1..59f02ce2c4f0fff4573781100180e59e0a02812a 100644
--- a/l10n/kn/files.po
+++ b/l10n/kn/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -74,7 +74,11 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr ""
 
@@ -124,40 +127,54 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -195,32 +212,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -324,22 +327,6 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index f99e2b89d90df4648fc9288bf2905bde37391be5..414603b41db1688dd65ed069655a0433774255dc 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -24,6 +24,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "분류 형식이 제공되지 않았습니다."
@@ -150,12 +179,12 @@ msgstr "ì´ˆ ì „"
 #: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
+msgstr[0] "%n분 전 "
 
 #: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
+msgstr[0] "%n시간 전 "
 
 #: js/js.js:815
 msgid "today"
@@ -168,7 +197,7 @@ msgstr "어제"
 #: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
-msgstr[0] ""
+msgstr[0] "%n일 전 "
 
 #: js/js.js:818
 msgid "last month"
@@ -177,7 +206,7 @@ msgstr "지난 달"
 #: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
+msgstr[0] "%n달 전 "
 
 #: js/js.js:820
 msgid "months ago"
@@ -191,23 +220,23 @@ msgstr "ìž‘ë…„"
 msgid "years ago"
 msgstr "ë…„ ì „"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "선택"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "예"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "아니요"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "승락"
 
@@ -440,7 +469,7 @@ msgstr "개인"
 msgid "Users"
 msgstr "사용자"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "앱"
 
@@ -573,10 +602,6 @@ msgstr ""
 msgid "Log out"
 msgstr "로그아웃"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "자동 로그인이 거부되었습니다!"
@@ -591,19 +616,19 @@ msgstr "최근에 암호를 변경하지 않았다면 계정이 탈취되었을
 msgid "Please change your password to secure your account again."
 msgstr "계정의 안전을 위하여 암호를 변경하십시오."
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "암호를 잊으셨습니까?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "기억하기"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "로그인"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "대체 "
 
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index cdab5cceeb10a8582e656040f5d8e5a3f7dd58b2..f7c8401395048a61b068ae01517f083530dc6957 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Sungjin Gang <potopro@gmail.com>, 2013
-# Sungjin Gang <potopro@gmail.com>, 2013
+# ujuc Gang <potopro@gmail.com>, 2013
+# ujuc Gang <potopro@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -76,7 +76,11 @@ msgstr "디스크에 쓰지 못했습니다"
 msgid "Not enough storage available"
 msgstr "저장소가 용량이 충분하지 않습니다."
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "올바르지 않은 디렉터리입니다."
 
@@ -96,21 +100,20 @@ msgstr "여유 공간이 부족합니다"
 msgid "Upload cancelled."
 msgstr "업로드가 취소되었습니다."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다."
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL을 입력해야 합니다."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "오류"
 
@@ -126,40 +129,54 @@ msgstr "영원히 삭제"
 msgid "Rename"
 msgstr "이름 바꾸기"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "대기 중"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name}이(가) 이미 존재함"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "바꾸기"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "이름 제안"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "취소"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name}이(가) {new_name}(으)로 대체됨"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "되돌리기"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "파일 업로드중"
 
@@ -197,32 +214,18 @@ msgid ""
 "big."
 msgstr "다운로드가 준비 중입니다. 파일 크기가 크다면 시간이 오래 걸릴 수도 있습니다."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "폴더 이름이 유효하지 않습니다. "
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "이름"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "크기"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "수정됨"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -326,22 +329,6 @@ msgstr "파일을 검색하고 있습니다. 기다려 주십시오."
 msgid "Current scanning"
 msgstr "현재 검색"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "파일"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "파일"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "파일 시스템 캐시 업그레이드 중..."
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index 1c826578446e6dea968eb2f08cfdf3dac1decbaa..f320d2ae96d63c3f1a6689dfbdc9a793d5cb3c68 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/lib.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# chohy <chohy@yahoo.com>, 2013
 # smallsnail <bjh13579@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-26 09:30+0000\n"
+"Last-Translator: chohy <chohy@yahoo.com>\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"
@@ -23,11 +24,11 @@ msgstr ""
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "현재 ownCloud 버전과 호환되지 않기 때문에 \"%s\" 앱을 설치할 수 없습니다."
 
 #: app.php:250
 msgid "No app name specified"
-msgstr ""
+msgstr "앱 이름이 지정되지 않았습니다."
 
 #: app.php:361
 msgid "Help"
@@ -52,7 +53,7 @@ msgstr "관리자"
 #: app.php:837
 #, php-format
 msgid "Failed to upgrade \"%s\"."
-msgstr ""
+msgstr "\"%s\" 업그레이드에 실패했습니다."
 
 #: defaults.php:35
 msgid "web services under your control"
@@ -61,7 +62,7 @@ msgstr "내가 관리하는 웹 서비스"
 #: files.php:66 files.php:98
 #, php-format
 msgid "cannot open \"%s\""
-msgstr ""
+msgstr "\"%s\"을(를) 열 수 없습니다."
 
 #: files.php:226
 msgid "ZIP download is turned off."
@@ -87,59 +88,59 @@ msgstr ""
 
 #: installer.php:63
 msgid "No source specified when installing app"
-msgstr ""
+msgstr "앱을 설치할 때 소스가 지정되지 않았습니다."
 
 #: installer.php:70
 msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "http에서 앱을 설치할 대 href가 지정되지 않았습니다."
 
 #: installer.php:75
 msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "로컬 파일에서 앱을 설치할 때 경로가 지정되지 않았습니다."
 
 #: installer.php:89
 #, php-format
 msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "%s 타입 아카이브는 지원되지 않습니다."
 
 #: installer.php:103
 msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "앱을 설치할 때 아카이브를 열지 못했습니다."
 
 #: installer.php:123
 msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "앱에서 info.xml 파일이 제공되지 않았습니다."
 
 #: installer.php:129
 msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "앱에 허용되지 않는 코드가 있어서 앱을 설치할 수 없습니다. "
 
 #: installer.php:138
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
-msgstr ""
+msgstr "현재 ownCloud 버전과 호환되지 않기 때문에 앱을 설치할 수 없습니다."
 
 #: installer.php:144
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
-msgstr ""
+msgstr "출하되지 않은 앱에 허용되지 않는 <shipped>true</shipped> 태그를 포함하고 있기 때문에 앱을 설치할 수 없습니다."
 
 #: installer.php:150
 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 ""
+msgstr "info.xml/version에 포함된 버전과 앱 스토어에 보고된 버전이 같지 않아서 앱을 설치할 수 없습니다. "
 
 #: installer.php:160
 msgid "App directory already exists"
-msgstr ""
+msgstr "앱 디렉토리가 이미 존재합니다. "
 
 #: installer.php:173
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "앱 폴더를 만들 수 없습니다. 권한을 수정하십시오. %s "
 
 #: json.php:28
 msgid "Application is not enabled"
@@ -183,16 +184,16 @@ msgstr "%s 에 적으신 데이터베이스 이름에는 점을 사용할수 없
 #: setup/mssql.php:20
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
+msgstr "MS SQL 사용자 이름이나 암호가 잘못되었습니다: %s"
 
 #: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
 #: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
-msgstr ""
+msgstr "기존 계정이나 administrator(관리자)를 입력해야 합니다."
 
 #: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "MySQL 사용자 이름이나 암호가 잘못되었습니다."
 
 #: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
 #: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
@@ -209,38 +210,38 @@ msgstr "DB 오류: \"%s\""
 #: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "잘못된 명령: \"%s\""
 
 #: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "MySQL 사용자 '%s'@'localhost'이(가) 이미 존재합니다."
 
 #: setup/mysql.php:86
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "이 사용자를 MySQL에서 뺍니다."
 
 #: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL 사용자 '%s'@'%%'이(가) 이미 존재합니다. "
 
 #: setup/mysql.php:92
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "이 사용자를 MySQL에서 뺍니다."
 
 #: setup/oci.php:34
 msgid "Oracle connection could not be established"
-msgstr ""
+msgstr "Oracle 연결을 수립할 수 없습니다."
 
 #: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Oracle 사용자 이름이나 암호가 잘못되었습니다."
 
 #: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "잘못된 명령: \"%s\", 이름: %s, 암호: %s"
 
 #: setup/postgresql.php:23 setup/postgresql.php:69
 msgid "PostgreSQL username and/or password not valid"
@@ -272,12 +273,12 @@ msgstr "ì´ˆ ì „"
 #: template/functions.php:81
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
+msgstr[0] "%n분 전 "
 
 #: template/functions.php:82
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
+msgstr[0] "%n시간 전 "
 
 #: template/functions.php:83
 msgid "today"
@@ -290,7 +291,7 @@ msgstr "어제"
 #: template/functions.php:85
 msgid "%n day go"
 msgid_plural "%n days ago"
-msgstr[0] ""
+msgstr[0] "%n일 전 "
 
 #: template/functions.php:86
 msgid "last month"
@@ -299,7 +300,7 @@ msgstr "지난 달"
 #: template/functions.php:87
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
+msgstr[0] "%n달 전 "
 
 #: template/functions.php:88
 msgid "last year"
@@ -311,7 +312,7 @@ msgstr "ë…„ ì „"
 
 #: template.php:297
 msgid "Caused by:"
-msgstr ""
+msgstr "원인: "
 
 #: vcategories.php:188 vcategories.php:249
 #, php-format
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index d258cb5e7f3e6bf7ca2ebedb04be54e28dd0dbbb..1948a8cf5eadd0220cf432ca274652a4d584de11 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -193,23 +222,23 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr ""
 
@@ -442,7 +471,7 @@ msgstr ""
 msgid "Users"
 msgstr "به‌كارهێنه‌ر"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "به‌رنامه‌كان"
 
@@ -575,10 +604,6 @@ msgstr ""
 msgid "Log out"
 msgstr "چوونەدەرەوە"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -593,19 +618,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index 6a342f3dfac1ff6ffd1f8dea4e1a8a9f68e6defa..b209e07c6f9551b855cd58dcd45781ae294fcda4 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +74,11 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "هه‌ڵه"
 
@@ -124,41 +127,57 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -196,34 +215,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "ناو"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -327,22 +330,6 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 998bef357927ec26b451a449d00b051630ce7f0b..6acfd95e04423154d8a96592af3b58d7c7840d0f 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -23,6 +23,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "Den/D' %s huet »%s« mat dir gedeelt"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Typ vun der Kategorie net uginn."
@@ -194,23 +223,23 @@ msgstr "Lescht Joer"
 msgid "years ago"
 msgstr "Joren hir"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Auswielen"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "Feeler beim Luede vun der Virlag fir d'Fichiers-Selektioun"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Jo"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Nee"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "OK"
 
@@ -443,7 +472,7 @@ msgstr "Perséinlech"
 msgid "Users"
 msgstr "Benotzer"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Applikatiounen"
 
@@ -576,10 +605,6 @@ msgstr "%s ass verfügbar. Kréi méi Informatiounen doriwwer wéi d'Aktualiséi
 msgid "Log out"
 msgstr "Ofmellen"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatesch Umeldung ofgeleent!"
@@ -594,19 +619,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Passwuert vergiess?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "verhalen"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Umellen"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Alternativ Umeldungen"
 
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 2043b2dca23438f12cc1b41ccc73c731b72ed08c..02542786a659e1da2fe990affaf270c742c8457e 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +74,11 @@ msgstr "Konnt net op den Disk schreiwen"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr "Upload ofgebrach."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Fehler"
 
@@ -124,41 +127,57 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "ofbriechen"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "réckgängeg man"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -196,34 +215,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Numm"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Gréisst"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Geännert"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -327,22 +330,6 @@ msgstr "Fichieren gi gescannt, war weg."
 msgid "Current scanning"
 msgstr "Momentane Scan"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "Datei"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "Dateien"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index bb9ac1fab081c1b5fc605e17eae6140421f5478d..493b46ace2cffd5c1316610d3611403460f24131 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# mambuta <vspyshkin@gmail.com>, 2013
 # Roman Deniobe <rms200x@gmail.com>, 2013
 # fizikiukas <fizikiukas@gmail.com>, 2013
 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:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +23,35 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared »%s« with you"
+msgstr "%s pasidalino »%s« su tavimi"
+
+#: ajax/share.php:227
+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 ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -150,16 +180,16 @@ msgstr "prieš sekundę"
 #: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] " prieš %n minutę"
+msgstr[1] " prieš %n minučių"
+msgstr[2] " prieš %n minučių"
 
 #: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "prieš %n valandą"
+msgstr[1] "prieš %n valandų"
+msgstr[2] "prieš %n valandų"
 
 #: js/js.js:815
 msgid "today"
@@ -183,9 +213,9 @@ msgstr "praeitą mėnesį"
 #: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "prieš %n mėnesį"
+msgstr[1] "prieš %n mėnesius"
+msgstr[2] "prieš %n mėnesių"
 
 #: js/js.js:820
 msgid "months ago"
@@ -199,23 +229,23 @@ msgstr "praeitais metais"
 msgid "years ago"
 msgstr "prieš metus"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Pasirinkite"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "Klaida pakraunant failų naršyklę"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Taip"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Ne"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Gerai"
 
@@ -382,7 +412,7 @@ msgstr "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud."
 #: lostpassword/controller.php:61
 #, php-format
 msgid "%s password reset"
-msgstr ""
+msgstr "%s slaptažodžio atnaujinimas"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -418,7 +448,7 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Taip, aš tikrai noriu atnaujinti slaptažodį"
 
 #: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
@@ -448,7 +478,7 @@ msgstr "Asmeniniai"
 msgid "Users"
 msgstr "Vartotojai"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Programos"
 
@@ -581,10 +611,6 @@ msgstr "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimÄ…."
 msgid "Log out"
 msgstr "Atsijungti"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatinis prisijungimas atmestas!"
@@ -599,19 +625,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Pamiršote slaptažodį?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "prisiminti"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Prisijungti"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Alternatyvūs prisijungimai"
 
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index e4819c2b8f51336cfe9d8d5df71d6519ebde3668..6fe0fe9291360830b6472ade6bc6973ffdbe8ffa 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -75,7 +75,11 @@ msgstr "Nepavyko įrašyti į diską"
 msgid "Not enough storage available"
 msgstr "Nepakanka vietos serveryje"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Neteisingas aplankas"
 
@@ -95,21 +99,20 @@ msgstr "Nepakanka vietos"
 msgid "Upload cancelled."
 msgstr "Įkėlimas atšauktas."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL negali būti tuščias."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 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:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Klaida"
 
@@ -125,42 +128,60 @@ msgstr "Ištrinti negrįžtamai"
 msgid "Rename"
 msgstr "Pervadinti"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Laukiantis"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} jau egzistuoja"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "pakeisti"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "pasiūlyti pavadinimą"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "atšaukti"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "pakeiskite {new_name} į {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "anuliuoti"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "įkeliami failai"
 
@@ -198,36 +219,18 @@ msgid ""
 "big."
 msgstr "Jūsų atsisiuntimas yra paruošiamas. tai gali užtrukti jei atsisiunčiamas didelis failas."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Dydis"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Pakeista"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -331,22 +334,6 @@ msgstr "Skenuojami failai, prašome palaukti."
 msgid "Current scanning"
 msgstr "Å iuo metu skenuojama"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "failas"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "failai"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Atnaujinamas sistemos kešavimas..."
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index 6a642972a446b3df4c0a83af1141a7824091aba5..21df78c7b6a8a27fef0e185446248a243d006511 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-26 20:00+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"
@@ -274,14 +274,14 @@ msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
+msgstr[2] " prieš %n minučių"
 
 #: template/functions.php:82
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "prieš %n valandų"
 
 #: template/functions.php:83
 msgid "today"
@@ -307,7 +307,7 @@ msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "prieš %n mėnesių"
 
 #: template/functions.php:88
 msgid "last year"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index c5a0608398f6d692e025a76fc78335c4682c9ce4..689ad0da124302c480c42b3951d3eed2b3a216e8 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -23,6 +23,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s kopīgots »%s« ar jums"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Kategorijas tips nav norādīts."
@@ -198,23 +227,23 @@ msgstr "gājušajā gadā"
 msgid "years ago"
 msgstr "gadus atpakaļ"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Izvēlieties"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "Kļūda ielādējot datņu ņēmēja veidni"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Jā"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "NÄ“"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Labi"
 
@@ -447,7 +476,7 @@ msgstr "Personīgi"
 msgid "Users"
 msgstr "Lietotāji"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Lietotnes"
 
@@ -580,10 +609,6 @@ msgstr "%s ir pieejams. Uzziniet vairāk kā atjaunināt."
 msgid "Log out"
 msgstr "Izrakstīties"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Vairāk programmu"
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automātiskā ierakstīšanās ir noraidīta!"
@@ -598,19 +623,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Aizmirsāt paroli?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "atcerēties"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Ierakstīties"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Alternatīvās pieteikšanās"
 
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index fc8b014e7b7915d3a2a6e9d4f7ee01546d8ae19f..5eff48359db58cf9c8d8e17da9e5ffca9c2438b9 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/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-08-23 20:15-0400\n"
-"PO-Revision-Date: 2013-08-23 14:10+0000\n"
-"Last-Translator: stendec <stendec@inbox.lv>\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -75,7 +75,11 @@ msgstr "Neizdevās saglabāt diskā"
 msgid "Not enough storage available"
 msgstr "Nav pietiekami daudz vietas"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Nederīga direktorija."
 
@@ -95,21 +99,20 @@ msgstr "Nepietiek brīvas vietas"
 msgid "Upload cancelled."
 msgstr "Augšupielāde ir atcelta."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:234 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL nevar būt tukšs."
 
-#: js/file-upload.js:239 lib/app.php:53
+#: js/file-upload.js:244 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:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Kļūda"
 
@@ -125,42 +128,60 @@ msgstr "Dzēst pavisam"
 msgid "Rename"
 msgstr "Pārsaukt"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Gaida savu kārtu"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} jau eksistē"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "aizvietot"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "ieteiktais nosaukums"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "atcelt"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "aizvietoja {new_name} ar {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "atsaukt"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n mapes"
+msgstr[1] "%n mape"
+msgstr[2] "%n mapes"
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n faili"
+msgstr[1] "%n fails"
+msgstr[2] "%n faili"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n"
 msgstr[1] "Augšupielāde %n failu"
 msgstr[2] "Augšupielāde %n failus"
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "fails augšupielādējas"
 
@@ -198,36 +219,18 @@ msgid ""
 "big."
 msgstr "Tiek sagatavota lejupielāde. Tas var aizņemt kādu laiciņu, ja datnes ir lielas."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Nederīgs mapes nosaukums. “Koplietots” izmantojums ir rezervēts ownCloud servisam."
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Nosaukums"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Izmērs"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Mainīts"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n mapes"
-msgstr[1] "%n mape"
-msgstr[2] "%n mapes"
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n faili"
-msgstr[1] "%n fails"
-msgstr[2] "%n faili"
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -331,22 +334,6 @@ msgstr "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet."
 msgid "Current scanning"
 msgstr "Šobrīd tiek caurskatīts"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "direktorija"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "direktorijas"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fails"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "faili"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Uzlabo datņu sistēmas kešatmiņu..."
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 701879cd51abffc13bd0a67abc1c99f9fb90ec43..c94527ab533d356df70f1375988cb596ca683dfd 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Не беше доставен тип на категорија."
@@ -193,23 +222,23 @@ msgstr "минатата година"
 msgid "years ago"
 msgstr "пред години"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Избери"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Да"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Не"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Во ред"
 
@@ -442,7 +471,7 @@ msgstr "Лично"
 msgid "Users"
 msgstr "Корисници"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Аппликации"
 
@@ -575,10 +604,6 @@ msgstr ""
 msgid "Log out"
 msgstr "Одјава"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Одбиена автоматска најава!"
@@ -593,19 +618,19 @@ msgstr "Ако не сте ја промениле лозинката во ск
 msgid "Please change your password to secure your account again."
 msgstr "Ве молам сменете ја лозинката да ја обезбедите вашата сметка повторно."
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Ја заборавивте лозинката?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "запамти"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Најава"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index a5d3ad3219424956636e6ab03b89ac10a4e3feac..19942eb2ca5719d8722ee95e10090976e915eed0 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +74,11 @@ msgstr "Неуспеав да запишам на диск"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr "Преземањето е прекинато."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине."
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "Адресата неможе да биде празна."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Грешка"
 
@@ -124,41 +127,57 @@ msgstr ""
 msgid "Rename"
 msgstr "Преименувај"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Чека"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} веќе постои"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "замени"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "предложи име"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "откажи"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "заменета {new_name} со {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "врати"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -196,34 +215,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Големина"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Променето"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -327,22 +330,6 @@ msgstr "Се скенираат датотеки, ве молам почекај
 msgid "Current scanning"
 msgstr "Моментално скенирам"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "датотека"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "датотеки"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/ml_IN/core.po b/l10n/ml_IN/core.po
index fccd1c57f6ea24a46064ebe104973e160b382eef..1e8a07eb01db3903e3fe7b10adafd01b25098e94 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -193,23 +222,23 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr ""
 
@@ -442,7 +471,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr ""
 
@@ -575,10 +604,6 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -593,19 +618,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ml_IN/files.po b/l10n/ml_IN/files.po
index 83b5a5da14d4ede41b0260d66ba5b6394bb72864..6f1d3f841e585554c8c25f2c2f8b9ae0cfcf90da 100644
--- a/l10n/ml_IN/files.po
+++ b/l10n/ml_IN/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -74,7 +74,11 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr ""
 
@@ -124,41 +127,57 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -196,34 +215,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -327,22 +330,6 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index cfb078e9e2ab64819e5f75c6b8632344e60e7867..0e3255b6ebe0decb84d04dbe4e9e99c5d11ded9e 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -189,23 +218,23 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Ya"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Tidak"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Ok"
 
@@ -438,7 +467,7 @@ msgstr "Peribadi"
 msgid "Users"
 msgstr "Pengguna"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Aplikasi"
 
@@ -571,10 +600,6 @@ msgstr ""
 msgid "Log out"
 msgstr "Log keluar"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -589,19 +614,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Hilang kata laluan?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "ingat"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Log masuk"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 83db5d48b5819317bcddabb347536d1cc19920f6..ce73924876576de6526a970dbf710b0fcac5c2a5 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +74,11 @@ msgstr "Gagal untuk disimpan"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr "Muatnaik dibatalkan."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Ralat"
 
@@ -124,40 +127,54 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Dalam proses"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "ganti"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "Batal"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -195,32 +212,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Saiz"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -324,22 +327,6 @@ msgstr "Fail sedang diimbas, harap bersabar."
 msgid "Current scanning"
 msgstr "Imbasan semasa"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fail"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "fail"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index a1e4d4619314233cbb41e851a1527e8d87971971..4a7e283b44cae2e51d81c2b2f45a88e479461c03 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -189,23 +218,23 @@ msgstr "မနှစ်က"
 msgid "years ago"
 msgstr "နှစ် အရင်က"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "ရွေးချယ်"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "ဟုတ်"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "မဟုတ်ဘူး"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "အိုကေ"
 
@@ -438,7 +467,7 @@ msgstr ""
 msgid "Users"
 msgstr "သုံးစွဲသူ"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Apps"
 
@@ -571,10 +600,6 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -589,19 +614,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "သင်၏စကားဝှက်ပျောက်သွားပြီလား။"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "မှတ်မိစေသည်"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "ဝင်ရောက်ရန်"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po
index 84606a993f6ca1dbc1004cad179f2e9c7a090284..65da5b1877877cc42d1a7253e6910709255daf52 100644
--- a/l10n/my_MM/files.po
+++ b/l10n/my_MM/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -74,7 +74,11 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr ""
 
@@ -124,40 +127,54 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -195,32 +212,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -324,22 +327,6 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 6533a847d2133f2b61ff110871b28cc5f8449c61..4bd2753d75640b73839eaeda11ee867fa91d0904 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -23,6 +23,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s delte »%s« med deg"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -194,23 +223,23 @@ msgstr "forrige år"
 msgid "years ago"
 msgstr "Ã¥r siden"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Velg"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Nei"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Ok"
 
@@ -443,7 +472,7 @@ msgstr "Personlig"
 msgid "Users"
 msgstr "Brukere"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Apper"
 
@@ -576,10 +605,6 @@ msgstr ""
 msgid "Log out"
 msgstr "Logg ut"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatisk pålogging avvist!"
@@ -594,19 +619,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Mistet passordet ditt?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "husk"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Logg inn"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index ea723ff9903ff48930b97cbc2c8feecce89a1940..c59874212be757b383ae9172ff0ea332b490df64 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +77,11 @@ msgstr "Klarte ikke å skrive til disk"
 msgid "Not enough storage available"
 msgstr "Ikke nok lagringsplass"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Ugyldig katalog."
 
@@ -97,21 +101,20 @@ msgstr "Ikke nok lagringsplass"
 msgid "Upload cancelled."
 msgstr "Opplasting avbrutt."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL-en kan ikke være tom."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 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:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Feil"
 
@@ -127,41 +130,57 @@ msgstr "Slett permanent"
 msgid "Rename"
 msgstr "Gi nytt navn"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Ventende"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} finnes allerede"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "erstatt"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "foreslå navn"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "erstattet {new_name} med {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "angre"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n mappe"
+msgstr[1] "%n mapper"
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n fil"
+msgstr[1] "%n filer"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Laster opp %n fil"
 msgstr[1] "Laster opp %n filer"
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "filer lastes opp"
 
@@ -199,34 +218,18 @@ msgid ""
 "big."
 msgstr "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Endret"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n mappe"
-msgstr[1] "%n mapper"
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n fil"
-msgstr[1] "%n filer"
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -330,22 +333,6 @@ msgstr "Skanner filer, vennligst vent."
 msgid "Current scanning"
 msgstr "Pågående skanning"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "katalog"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "kataloger"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fil"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "filer"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Oppgraderer filsystemets  mellomlager..."
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index 8278426322d9a20cfffa3d3ade247f7dc6af173a..5183d028931403d8c5a49c86cc97ec14917d1d2b 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -193,23 +222,23 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr ""
 
@@ -442,7 +471,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr ""
 
@@ -575,10 +604,6 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -593,19 +618,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ne/files.po b/l10n/ne/files.po
index d09313ed5141bc54955b13e39c540ce7a45e6bc5..16ee27473723136e968cea3249f7f6a2a6f642cd 100644
--- a/l10n/ne/files.po
+++ b/l10n/ne/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -74,7 +74,11 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr ""
 
@@ -124,41 +127,57 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -196,34 +215,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -327,22 +330,6 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 59e41074d639d83a24d68fd7c49655a9da669761..340455fdb1e731609362a548be145afc4ae18601 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -25,6 +25,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s deelde »%s« met jou"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Categorie type niet opgegeven."
@@ -196,23 +225,23 @@ msgstr "vorig jaar"
 msgid "years ago"
 msgstr "jaar geleden"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Kies"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "Fout bij laden van bestandsselectie sjabloon"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Nee"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Ok"
 
@@ -445,7 +474,7 @@ msgstr "Persoonlijk"
 msgid "Users"
 msgstr "Gebruikers"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Apps"
 
@@ -578,10 +607,6 @@ msgstr "%s is beschikbaar. Verkrijg meer informatie over het bijwerken."
 msgid "Log out"
 msgstr "Afmelden"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Meer applicaties"
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatische aanmelding geweigerd!"
@@ -596,19 +621,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Wachtwoord vergeten?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "onthoud gegevens"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Meld je aan"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Alternatieve inlogs"
 
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index 154a7551d0c31507c602f554d0721e48ba537886..1ef60e724aba3b11aedf46e7002e259770ea33eb 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-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-19 22:00+0000\n"
-"Last-Translator: kwillems <kwillems@zonnet.nl>\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -76,7 +76,11 @@ msgstr "Schrijven naar schijf mislukt"
 msgid "Not enough storage available"
 msgstr "Niet genoeg opslagruimte beschikbaar"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Ongeldige directory."
 
@@ -96,21 +100,20 @@ msgstr "Niet genoeg ruimte beschikbaar"
 msgid "Upload cancelled."
 msgstr "Uploaden geannuleerd."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:234 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL kan niet leeg zijn."
 
-#: js/file-upload.js:239 lib/app.php:53
+#: js/file-upload.js:244 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:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Fout"
 
@@ -126,41 +129,57 @@ msgstr "Verwijder definitief"
 msgid "Rename"
 msgstr "Hernoem"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "In behandeling"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} bestaat al"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "vervang"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "Stel een naam voor"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "annuleren"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "verving {new_name} met {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "ongedaan maken"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] "%n mappen"
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] "%n bestanden"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n bestand aan het uploaden"
 msgstr[1] "%n bestanden aan het uploaden"
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "bestanden aan het uploaden"
 
@@ -198,34 +217,18 @@ msgid ""
 "big."
 msgstr "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Naam"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Grootte"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Aangepast"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] "%n mappen"
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] "%n bestanden"
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -329,22 +332,6 @@ msgstr "Bestanden worden gescand, even wachten."
 msgid "Current scanning"
 msgstr "Er wordt gescand"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "directory"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "directories"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "bestand"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "bestanden"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Upgraden bestandssysteem cache..."
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index 468b5856f6b5817b535d84e39e625f97645d0c79..08fe305989ff5ca5e8e87acabfa3bd45a7e84368 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # André Koot <meneer@tken.net>, 2013
+# kwillems <kwillems@zonnet.nl>, 2013
 # Len <lenny@weijl.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-25 23:30+0000\n"
+"Last-Translator: kwillems <kwillems@zonnet.nl>\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,7 +29,7 @@ msgstr ""
 
 #: app.php:250
 msgid "No app name specified"
-msgstr ""
+msgstr "De app naam is niet gespecificeerd."
 
 #: app.php:361
 msgid "Help"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index c31454799316cbca060bc6901a6efeed195eeb33..fef0b93014e54be6d7af25a51d9fa11f575767ff 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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-25 23:30+0000\n"
+"Last-Translator: kwillems <kwillems@zonnet.nl>\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"
@@ -106,11 +106,11 @@ msgstr "Even geduld aub...."
 
 #: js/apps.js:71 js/apps.js:72 js/apps.js:92
 msgid "Error while disabling app"
-msgstr ""
+msgstr "Fout tijdens het uitzetten van het programma"
 
 #: js/apps.js:91 js/apps.js:104 js/apps.js:105
 msgid "Error while enabling app"
-msgstr ""
+msgstr "Fout tijdens het aanzetten van het programma"
 
 #: js/apps.js:115
 msgid "Updating...."
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index d7afc5bf4102cbe4070d7fe88054cd09f51dbd9a..dd3e636cc48cd5c51f9aa74742b15d4e62431a7f 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -24,6 +24,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Ingen kategoritype."
@@ -195,23 +224,23 @@ msgstr "i fjor"
 msgid "years ago"
 msgstr "Ã¥r sidan"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Vel"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Nei"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Greitt"
 
@@ -444,7 +473,7 @@ msgstr "Personleg"
 msgid "Users"
 msgstr "Brukarar"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Program"
 
@@ -577,10 +606,6 @@ msgstr "%s er tilgjengeleg. FÃ¥ meir informasjon om korleis du oppdaterer."
 msgid "Log out"
 msgstr "Logg ut"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatisk innlogging avvist!"
@@ -595,19 +620,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Gløymt passordet?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "hugs"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Logg inn"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Alternative innloggingar"
 
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index fe27f782683f6e0e5c6f020c7a3d071410ce5344..be3bfcba3ee45b5ee9539daaf72fb36251755d1c 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -76,7 +76,11 @@ msgstr "Klarte ikkje skriva til disk"
 msgid "Not enough storage available"
 msgstr "Ikkje nok lagringsplass tilgjengeleg"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Ugyldig mappe."
 
@@ -96,21 +100,20 @@ msgstr "Ikkje nok lagringsplass tilgjengeleg"
 msgid "Upload cancelled."
 msgstr "Opplasting avbroten."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "Nettadressa kan ikkje vera tom."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 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:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Feil"
 
@@ -126,41 +129,57 @@ msgstr "Slett for godt"
 msgid "Rename"
 msgstr "Endra namn"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Under vegs"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} finst allereie"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "byt ut"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "føreslå namn"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "bytte ut {new_name} med {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "angre"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "filer lastar opp"
 
@@ -198,34 +217,18 @@ msgid ""
 "big."
 msgstr "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Storleik"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Endra"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -329,22 +332,6 @@ msgstr "Skannar filer, ver venleg og vent."
 msgid "Current scanning"
 msgstr "Køyrande skanning"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Oppgraderer mellomlageret av filsystemet …"
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index 0fee2d59130ec9b570e452c272490e06698477c0..f419c3efaf34e46c06f419d4a9ca66a1b0c8a5da 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -193,23 +222,23 @@ msgstr "an passat"
 msgid "years ago"
 msgstr "ans a"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Causís"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Ã’c"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Non"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "D'accòrdi"
 
@@ -442,7 +471,7 @@ msgstr "Personal"
 msgid "Users"
 msgstr "Usancièrs"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Apps"
 
@@ -575,10 +604,6 @@ msgstr ""
 msgid "Log out"
 msgstr "Sortida"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -593,19 +618,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "L'as perdut lo senhal ?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "bremba-te"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Dintrada"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index 89aa3f3477c2ce7638681faeb430937aac6b884b..d33b8a7f8a8f102c45ef67937f79ec8f3510cfe0 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +74,11 @@ msgstr "L'escriptura sul disc a fracassat"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr "Amontcargar anullat."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Error"
 
@@ -124,41 +127,57 @@ msgstr ""
 msgid "Rename"
 msgstr "Torna nomenar"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Al esperar"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "remplaça"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "nom prepausat"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "anulla"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "defar"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "fichièrs al amontcargar"
 
@@ -196,34 +215,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Talha"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -327,22 +330,6 @@ msgstr "Los fiichièrs son a èsser explorats, "
 msgid "Current scanning"
 msgstr "Exploracion en cors"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fichièr"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "fichièrs"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 1917f75d11497625c8e1ce05e05f567e67fe8405..edaed21e00e7cab0ec404a746cc78a5b66785fba 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -24,6 +24,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s Współdzielone »%s« z tobą"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Nie podano typu kategorii."
@@ -199,23 +228,23 @@ msgstr "w zeszłym roku"
 msgid "years ago"
 msgstr "lat temu"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Wybierz"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "BÅ‚Ä…d podczas Å‚adowania pliku wybranego szablonu"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Tak"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Nie"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "OK"
 
@@ -448,7 +477,7 @@ msgstr "Osobiste"
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Aplikacje"
 
@@ -581,10 +610,6 @@ msgstr "%s jest dostępna. Dowiedz się więcej na temat aktualizacji."
 msgid "Log out"
 msgstr "Wyloguj"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Więcej aplikacji"
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatyczne logowanie odrzucone!"
@@ -599,19 +624,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Nie pamiętasz hasła?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "pamiętaj"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Zaloguj"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Alternatywne loginy"
 
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 4afe550b713fb1c726eb707218ee1fe72660c4c2..fc486609894f8a1cb5687a48de6d91d72c1242eb 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -76,7 +76,11 @@ msgstr "BÅ‚Ä…d zapisu na dysk"
 msgid "Not enough storage available"
 msgstr "Za mało dostępnego miejsca"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Zła ścieżka."
 
@@ -96,21 +100,20 @@ msgstr "Za mało miejsca"
 msgid "Upload cancelled."
 msgstr "Wczytywanie anulowane."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL nie może być pusty."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 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:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
@@ -126,42 +129,60 @@ msgstr "Trwale usuń"
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "OczekujÄ…ce"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} już istnieje"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "zastÄ…p"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "zasugeruj nazwÄ™"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "anuluj"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "zastÄ…piono {new_name} przez {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "cofnij"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "pliki wczytane"
 
@@ -199,36 +220,18 @@ msgid ""
 "big."
 msgstr "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Nieprawidłowa nazwa folderu. Korzystanie z nazwy „Shared” jest zarezerwowane dla ownCloud"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Nazwa"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Rozmiar"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Modyfikacja"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -332,22 +335,6 @@ msgstr "Skanowanie plików, proszę czekać."
 msgid "Current scanning"
 msgstr "Aktualnie skanowane"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "Katalog"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "Katalogi"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "plik"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "pliki"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Uaktualnianie plików pamięci podręcznej..."
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 703b1feb263f2b9c71c2f74f9cabbd50f353fbc6..44989e4aad88ac3d3a876d5918b879c781cc4806 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -24,6 +24,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s compartilhou »%s« com você"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Tipo de categoria não fornecido."
@@ -195,23 +224,23 @@ msgstr "último ano"
 msgid "years ago"
 msgstr "anos atrás"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Escolha"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "Template selecionador Erro ao carregar arquivo"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Sim"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Não"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Ok"
 
@@ -444,7 +473,7 @@ msgstr "Pessoal"
 msgid "Users"
 msgstr "Usuários"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Aplicações"
 
@@ -577,10 +606,6 @@ msgstr "%s está disponível. Obtenha mais informações sobre como atualizar."
 msgid "Log out"
 msgstr "Sair"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Mais aplicativos"
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Entrada Automática no Sistema Rejeitada!"
@@ -595,19 +620,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Esqueceu sua senha?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "lembrar"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Fazer login"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Logins alternativos"
 
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index d9250a024c1a616e1dc195dc6b2782393625e81c..5f0718ae9da1fb4e5f1eae0c271ecaedec39f0da 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -77,7 +77,11 @@ msgstr "Falha ao escrever no disco"
 msgid "Not enough storage available"
 msgstr "Espaço de armazenamento insuficiente"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Diretório inválido."
 
@@ -97,21 +101,20 @@ msgstr "Espaço de armazenamento insuficiente"
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL não pode ficar em branco"
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 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:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Erro"
 
@@ -127,41 +130,57 @@ msgstr "Excluir permanentemente"
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} já existe"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "substituir"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "sugerir nome"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "Substituído {old_name} por {new_name} "
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "enviando arquivos"
 
@@ -199,34 +218,18 @@ msgid ""
 "big."
 msgstr "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Nome de pasta inválido. O uso de 'Shared' é reservado para o Owncloud"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -330,22 +333,6 @@ msgstr "Arquivos sendo escaneados, por favor aguarde."
 msgid "Current scanning"
 msgstr "Scanning atual"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "diretório"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "diretórios"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "arquivo"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "arquivos"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Atualizando cache do sistema de arquivos..."
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index 509528a2d20ff8548a6ba5b8e8287ec8c9f463f1..d35e68a4ec15f79a4da0318e5ac71198366f5364 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-26 12:50+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,11 +23,11 @@ msgstr ""
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "O aplicativo \"%s\" não pode ser instalado porque não é compatível com esta versão do ownCloud."
 
 #: app.php:250
 msgid "No app name specified"
-msgstr ""
+msgstr "O nome do aplicativo não foi especificado."
 
 #: app.php:361
 msgid "Help"
@@ -87,59 +87,59 @@ msgstr "Baixe os arquivos em pedaços menores, separadamente ou solicite educada
 
 #: installer.php:63
 msgid "No source specified when installing app"
-msgstr ""
+msgstr "Nenhuma fonte foi especificada enquanto instalava o aplicativo"
 
 #: installer.php:70
 msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Nenhuma href foi especificada enquanto instalava o aplicativo de httml"
 
 #: installer.php:75
 msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Nenhum caminho foi especificado enquanto instalava o aplicativo do arquivo local"
 
 #: installer.php:89
 #, php-format
 msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Arquivos do tipo %s não são suportados"
 
 #: installer.php:103
 msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Falha para abrir o arquivo enquanto instalava o aplicativo"
 
 #: installer.php:123
 msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "O aplicativo não fornece um arquivo info.xml"
 
 #: installer.php:129
 msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "O aplicativo não pode ser instalado por causa do código não permitido no Aplivativo"
 
 #: installer.php:138
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
-msgstr ""
+msgstr "O aplicativo não pode ser instalado porque não é compatível com esta versão do ownCloud"
 
 #: installer.php:144
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
-msgstr ""
+msgstr "O aplicativo não pode ser instalado porque ele contém a marca <shipped>verdadeiro</shipped> que não é permitido para aplicações não embarcadas"
 
 #: installer.php:150
 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 ""
+msgstr "O aplicativo não pode ser instalado porque a versão em info.xml /versão não é a mesma que a versão relatada na App Store"
 
 #: installer.php:160
 msgid "App directory already exists"
-msgstr ""
+msgstr "Diretório App  já existe"
 
 #: installer.php:173
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Não é possível criar pasta app. Corrija as permissões. %s"
 
 #: json.php:28
 msgid "Application is not enabled"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index e6dd573d4ddf39e2500d90f4fd009681187b6e9c..4214958d1ab6f0098650e90ed3e7b01bd3429c64 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-26 12:21+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -104,11 +104,11 @@ msgstr "Por favor, aguarde..."
 
 #: js/apps.js:71 js/apps.js:72 js/apps.js:92
 msgid "Error while disabling app"
-msgstr ""
+msgstr "Erro enquanto desabilitava o aplicativo"
 
 #: js/apps.js:91 js/apps.js:104 js/apps.js:105
 msgid "Error while enabling app"
-msgstr ""
+msgstr "Erro enquanto habilitava o aplicativo"
 
 #: js/apps.js:115
 msgid "Updating...."
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index 8e83ab7e75d8ab429af9d742aeeb6dd6ba90c010..b2edb3b335ac97ce885aae1331b2fc316e5481e5 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-26 12:30+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -157,7 +157,7 @@ msgstr "Filtro de Login de Usuário"
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action. Example: \"uid=%%uid\""
-msgstr ""
+msgstr "Define o filtro a ser aplicado, o login é feito. %%uid substitui o nome do usuário na ação de login. Exemplo: \"uid=%%uid\""
 
 #: templates/settings.php:55
 msgid "User List Filter"
@@ -167,7 +167,7 @@ msgstr "Filtro de Lista de Usuário"
 msgid ""
 "Defines the filter to apply, when retrieving users (no placeholders). "
 "Example: \"objectClass=person\""
-msgstr ""
+msgstr "Define o filtro a ser aplicado, ao recuperar usuários (sem espaços reservados). Exemplo: \"objectClass=person\""
 
 #: templates/settings.php:59
 msgid "Group Filter"
@@ -177,7 +177,7 @@ msgstr "Filtro de Grupo"
 msgid ""
 "Defines the filter to apply, when retrieving groups (no placeholders). "
 "Example: \"objectClass=posixGroup\""
-msgstr ""
+msgstr "Define o filtro a ser aplicado, ao recuperar grupos (sem espaços reservados). Exemplo: \"objectClass=posixGroup\""
 
 #: templates/settings.php:66
 msgid "Connection Settings"
@@ -238,7 +238,7 @@ msgstr "Desligar validação de certificado SSL."
 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 ""
+msgstr "Não recomendado, use-o somente para teste! Se a conexão só funciona com esta opção, importar o certificado SSL do servidor LDAP em seu servidor %s."
 
 #: templates/settings.php:76
 msgid "Cache Time-To-Live"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index d1bc08b13f10e4e3cbae374f43e0e1277daf6bdc..e188e5ccc383a1ed24c0b28b3345d9bf51638daf 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -26,6 +26,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s partilhado »%s« contigo"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Tipo de categoria não fornecido"
@@ -197,23 +226,23 @@ msgstr "ano passado"
 msgid "years ago"
 msgstr "anos atrás"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Escolha"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "Erro ao carregar arquivo do separador modelo"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Sim"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Não"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Ok"
 
@@ -446,7 +475,7 @@ msgstr "Pessoal"
 msgid "Users"
 msgstr "Utilizadores"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Aplicações"
 
@@ -579,10 +608,6 @@ msgstr "%s está disponível. Tenha mais informações como actualizar."
 msgid "Log out"
 msgstr "Sair"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Login automático rejeitado!"
@@ -597,19 +622,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Esqueceu-se da sua password?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "lembrar"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Entrar"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Contas de acesso alternativas"
 
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 3534f1cc5965d96bf1726f99ca06c01db5572926..78b08930414deb4b5acf81a130f2bf8e9214ed05 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -76,7 +76,11 @@ msgstr "Falhou a escrita no disco"
 msgid "Not enough storage available"
 msgstr "Não há espaço suficiente em disco"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Directório Inválido"
 
@@ -96,21 +100,20 @@ msgstr "Espaço em disco insuficiente!"
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "O URL não pode estar vazio."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 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:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Erro"
 
@@ -126,41 +129,57 @@ msgstr "Eliminar permanentemente"
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "O nome {new_name} já existe"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "substituir"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "sugira um nome"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "substituido {new_name} por {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "A enviar os ficheiros"
 
@@ -198,34 +217,18 @@ msgid ""
 "big."
 msgstr "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Nome de pasta inválido. O Uso de 'shared' é reservado para o ownCloud"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -329,22 +332,6 @@ msgstr "Os ficheiros estão a ser analisados, por favor aguarde."
 msgid "Current scanning"
 msgstr "Análise actual"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "diretório"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "diretórios"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "ficheiro"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "ficheiros"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Atualizar cache do sistema de ficheiros..."
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 94a85870e9b56ac04c4d5dc9012fc3352b2f4a8d..93a50da14d5082f37a61235dd18915864128d6d1 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -26,6 +26,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s Partajat »%s« cu tine de"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Tipul de categorie nu a fost specificat."
@@ -201,23 +230,23 @@ msgstr "ultimul an"
 msgid "years ago"
 msgstr "ani în urmă"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Alege"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "Eroare la încărcarea șablonului selectorului de fișiere"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Da"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Nu"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Ok"
 
@@ -450,7 +479,7 @@ msgstr "Personal"
 msgid "Users"
 msgstr "Utilizatori"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Aplicații"
 
@@ -583,10 +612,6 @@ msgstr "%s este disponibil. Vezi mai multe informații despre procesul de actual
 msgid "Log out"
 msgstr "Ieșire"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Autentificare automată respinsă!"
@@ -601,19 +626,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Ai uitat parola?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "amintește"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Autentificare"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Conectări alternative"
 
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 7f0ae89b77f03d80c5e3dbe28b564dc65ff41e52..6c1b9795dad3f16b34413e465d7e7371d298b0f8 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -77,7 +77,11 @@ msgstr "Eroare la scriere pe disc"
 msgid "Not enough storage available"
 msgstr "Nu este suficient spațiu disponibil"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Director invalid."
 
@@ -97,21 +101,20 @@ msgstr "Nu este suficient spațiu disponibil"
 msgid "Upload cancelled."
 msgstr "Încărcare anulată."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "Adresa URL nu poate fi goală."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 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:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Eroare"
 
@@ -127,42 +130,60 @@ msgstr "Stergere permanenta"
 msgid "Rename"
 msgstr "Redenumire"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "În așteptare"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} deja exista"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "înlocuire"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "sugerează nume"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "anulare"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} inlocuit cu {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "Anulează ultima acțiune"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "fișiere se încarcă"
 
@@ -200,36 +221,18 @@ msgid ""
 "big."
 msgstr "Se pregătește descărcarea. Aceasta poate să dureze ceva timp dacă fișierele sunt mari."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Invalid folder name. Usage of 'Shared' is reserved by Ownclou"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Nume"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Dimensiune"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -333,22 +336,6 @@ msgstr "Fișierele sunt scanate, te rog așteptă."
 msgid "Current scanning"
 msgstr "ÃŽn curs de scanare"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "catalog"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "cataloage"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fișier"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "fișiere"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Modernizare fisiere de sistem cache.."
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 0eea0c714459e7456fcdcacf0d2380b1197b4e71..59c411b72095f77dba1ec7207bc302e982ee090f 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -30,6 +30,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s поделился »%s« с вами"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Тип категории не предоставлен"
@@ -205,23 +234,23 @@ msgstr "в прошлом году"
 msgid "years ago"
 msgstr "несколько лет назад"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Выбрать"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "Ошибка при загрузке файла выбора шаблона"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Да"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Нет"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Ок"
 
@@ -454,7 +483,7 @@ msgstr "Личное"
 msgid "Users"
 msgstr "Пользователи"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Приложения"
 
@@ -587,10 +616,6 @@ msgstr "%s доступно. Получить дополнительную ин
 msgid "Log out"
 msgstr "Выйти"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Ещё приложения"
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Автоматический вход в систему отключен!"
@@ -605,19 +630,19 @@ msgstr "Если Вы недавно не меняли свой пароль, т
 msgid "Please change your password to secure your account again."
 msgstr "Пожалуйста, смените пароль, чтобы обезопасить свою учетную запись."
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Забыли пароль?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "запомнить"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Войти"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Альтернативные имена пользователя"
 
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index a34e9fe5a4cd4c1cbcc42c10935395cb6160bb67..7a7e2c74f9e2a63df09988f82031685a1e28670f 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -79,7 +79,11 @@ msgstr "Ошибка записи на диск"
 msgid "Not enough storage available"
 msgstr "Недостаточно доступного места в хранилище"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Неправильный каталог."
 
@@ -99,21 +103,20 @@ msgstr "Недостаточно свободного места"
 msgid "Upload cancelled."
 msgstr "Загрузка отменена."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку."
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "Ссылка не может быть пустой."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано."
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Ошибка"
 
@@ -129,42 +132,60 @@ msgstr "Удалено навсегда"
 msgid "Rename"
 msgstr "Переименовать"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Ожидание"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} уже существует"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "заменить"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "предложить название"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "отмена"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "заменено {new_name} на {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "отмена"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n папка"
+msgstr[1] "%n папки"
+msgstr[2] "%n папок"
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n файл"
+msgstr[1] "%n файла"
+msgstr[2] "%n файлов"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Закачка %n файла"
 msgstr[1] "Закачка %n файлов"
 msgstr[2] "Закачка %n файлов"
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "файлы загружаются"
 
@@ -202,36 +223,18 @@ msgid ""
 "big."
 msgstr "Загрузка началась. Это может потребовать много времени, если файл большого размера."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано."
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Имя"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Изменён"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n папка"
-msgstr[1] "%n папки"
-msgstr[2] "%n папок"
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n файл"
-msgstr[1] "%n файла"
-msgstr[2] "%n файлов"
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -335,22 +338,6 @@ msgstr "Подождите, файлы сканируются."
 msgid "Current scanning"
 msgstr "Текущее сканирование"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "директория"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "директории"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "файл"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "файлы"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Обновление кэша файловой системы..."
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 672f6b6bebcfcd18ff60f29bd812a78104f9fc4a..2777eaad80fa03ff174d9ad6f9596523e34a0f47 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Aleksey Grigoryev <alexvamp@gmail.com>, 2013
 # Alexander Shashkevych <alex@stunpix.com>, 2013
 # alfsoft <alfsoft@gmail.com>, 2013
 # lord93 <lordakryl@gmail.com>, 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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-26 07:10+0000\n"
+"Last-Translator: Aleksey Grigoryev <alexvamp@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -136,7 +137,7 @@ msgstr "Обновлено"
 
 #: js/personal.js:150
 msgid "Decrypting files... Please wait, this can take some time."
-msgstr ""
+msgstr "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время."
 
 #: js/personal.js:172
 msgid "Saving..."
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index 1f04852c7aa43e79dba0f1cde9bfecc59925122f..613e05550036f5439c9205d127a9d9f934c94520 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -193,23 +222,23 @@ msgstr "පෙර අවුරුද්දේ"
 msgid "years ago"
 msgstr "අවුරුදු කීපයකට පෙර"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "තෝරන්න"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "ඔව්"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "එපා"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "හරි"
 
@@ -442,7 +471,7 @@ msgstr "පෞද්ගලික"
 msgid "Users"
 msgstr "පරිශීලකයන්"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "යෙදුම්"
 
@@ -575,10 +604,6 @@ msgstr ""
 msgid "Log out"
 msgstr "නික්මීම"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -593,19 +618,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "මුරපදය අමතකද?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "මතක තබාගන්න"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "ප්‍රවේශවන්න"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index b0ac13562ad298db9d07d015c5ab3f758046c814..5a47ffe3d4d664de7afa21fc5477d1b9829622c8 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +74,11 @@ msgstr "තැටිගත කිරීම අසාර්ථකයි"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr "උඩුගත කිරීම අත් හරින්න ලදී"
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත"
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "යොමුව හිස් විය නොහැක"
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "දෝෂයක්"
 
@@ -124,41 +127,57 @@ msgstr ""
 msgid "Rename"
 msgstr "නැවත නම් කරන්න"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "ප්‍රතිස්ථාපනය කරන්න"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "නමක් යෝජනා කරන්න"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "අත් හරින්න"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "නිෂ්ප්‍රභ කරන්න"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -196,34 +215,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "නම"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "ප්‍රමාණය"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "වෙනස් කළ"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -327,22 +330,6 @@ msgstr "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳ
 msgid "Current scanning"
 msgstr "වර්තමාන පරික්ෂාව"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "ගොනුව"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "ගොනු"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index d3d50d2c7553452e5a09b34aa8cf0a5254f2abe6..921159e7c4d858bab2d9ce14f14c28b274585fd2 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -197,23 +226,23 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr ""
 
@@ -446,7 +475,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr ""
 
@@ -579,10 +608,6 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -597,19 +622,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/sk/files.po b/l10n/sk/files.po
index df3871ecaa71c8c31a108c95f78b4c2e051d1a2b..17be34bd16c359e1460d9a5915a6fff4b2ef7d05 100644
--- a/l10n/sk/files.po
+++ b/l10n/sk/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -74,7 +74,11 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr ""
 
@@ -124,42 +127,60 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -197,36 +218,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -330,22 +333,6 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index c0bc9aaaa615a444a1a9ac23eddc18b900a0127b..0c6bbe58a8ca28519ce0bd6ba1484be662daa675 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # mhh <marian.hvolka@stuba.sk>, 2013
+# martin, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-21 08:11-0400\n"
-"PO-Revision-Date: 2013-08-20 19:10+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -23,6 +24,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s s Vami zdieľa »%s«"
 
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr "Mód údržby zapnutý"
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr "Mód údržby vypnutý"
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr "Databáza aktualizovaná"
+
+#: ajax/update.php:20
+msgid "Updating filecache, this may take really long..."
+msgstr "Aktualizácia \"filecache\", toto môže trvať dlhšie..."
+
+#: ajax/update.php:23
+msgid "Updated filecache"
+msgstr "\"Filecache\" aktualizovaná"
+
+#: ajax/update.php:26
+#, php-format
+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."
@@ -447,7 +477,7 @@ msgstr "Osobné"
 msgid "Users"
 msgstr "Používatelia"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Aplikácie"
 
@@ -580,10 +610,6 @@ msgstr "%s je dostupná. Získajte viac informácií k postupu aktualizáce."
 msgid "Log out"
 msgstr "Odhlásiť"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Viac aplikácií"
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatické prihlásenie bolo zamietnuté!"
@@ -598,19 +624,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Zabudli ste heslo?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "zapamätať"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Prihlásiť sa"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Alternatívne prihlasovanie"
 
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 62660788d83f59260699f7c1459532df20d36905..6b81e2d7efee553c403890a54f0a4b5d11342d27 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/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-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-20 20:20+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -75,7 +75,11 @@ msgstr "Zápis na disk sa nepodaril"
 msgid "Not enough storage available"
 msgstr "Nedostatok dostupného úložného priestoru"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Neplatný priečinok."
 
@@ -95,21 +99,20 @@ msgstr "Nie je k dispozícii dostatok miesta"
 msgid "Upload cancelled."
 msgstr "Odosielanie zrušené."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:234 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL nemôže byť prázdne."
 
-#: js/file-upload.js:239 lib/app.php:53
+#: js/file-upload.js:244 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:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Chyba"
 
@@ -125,42 +128,60 @@ msgstr "Zmazať  trvalo"
 msgid "Rename"
 msgstr "Premenovať"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Prebieha"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} už existuje"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "nahradiť"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "pomôcť s menom"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "zrušiť"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "prepísaný {new_name} súborom {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "vrátiť"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+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:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n súbor"
+msgstr[1] "%n súbory"
+msgstr[2] "%n súborov"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Nahrávam %n súbor"
 msgstr[1] "Nahrávam %n súbory"
 msgstr[2] "Nahrávam %n súborov"
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "nahrávanie súborov"
 
@@ -198,36 +219,18 @@ msgid ""
 "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:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Neplatné meno priečinka. Používanie mena 'Shared' je vyhradené len pre Owncloud"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Názov"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Veľkosť"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Upravené"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n priečinok"
-msgstr[1] "%n priečinky"
-msgstr[2] "%n priečinkov"
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n súbor"
-msgstr[1] "%n súbory"
-msgstr[2] "%n súborov"
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -331,22 +334,6 @@ msgstr "Čakajte, súbory sú prehľadávané."
 msgid "Current scanning"
 msgstr "Práve prezerané"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "priečinok"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "priečinky"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "súbor"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "súbory"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Aktualizujem medzipamäť súborového systému..."
diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po
index 40a9ba181d6d4f486604cc35a839d594c9218327..7353664590fef4d6f53816798214a162fed5c755 100644
--- a/l10n/sk_SK/files_encryption.po
+++ b/l10n/sk_SK/files_encryption.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # mhh <marian.hvolka@stuba.sk>, 2013
+# martin, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-19 19:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-28 18:40+0000\n"
+"Last-Translator: martin\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"
@@ -60,22 +61,22 @@ msgid ""
 "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 ""
+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."
 
 #: hooks/hooks.php:41
 msgid "Missing requirements."
-msgstr ""
+msgstr "Chýbajúce požiadavky."
 
 #: hooks/hooks.php:42
 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 ""
+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:249
 msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Nasledujúci používatelia nie sú nastavení pre šifrovanie:"
 
 #: js/settings-admin.js:11
 msgid "Saving..."
@@ -89,7 +90,7 @@ msgstr "Váš súkromný kľúč je neplatný. Možno bolo Vaše heslo zmenené
 
 #: templates/invalid_private_key.php:7
 msgid "You can unlock your private key in your "
-msgstr ""
+msgstr "Môžte odomknúť váš privátny kľúč v"
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
@@ -102,11 +103,11 @@ msgstr "Å ifrovanie"
 #: templates/settings-admin.php:10
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
-msgstr ""
+msgstr "Povoliť obnovovací kľúč (umožňuje obnoviť používateľské súbory v prípade straty hesla):"
 
 #: templates/settings-admin.php:14
 msgid "Recovery key password"
-msgstr ""
+msgstr "Heslo obnovovacieho kľúča"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -118,15 +119,15 @@ msgstr "Zakázané"
 
 #: templates/settings-admin.php:34
 msgid "Change recovery key password:"
-msgstr ""
+msgstr "Zmeniť heslo obnovovacieho kľúča:"
 
 #: templates/settings-admin.php:41
 msgid "Old Recovery key password"
-msgstr ""
+msgstr "Staré heslo obnovovacieho kľúča"
 
 #: templates/settings-admin.php:48
 msgid "New Recovery key password"
-msgstr ""
+msgstr "Nové heslo obnovovacieho kľúča"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index b40d282cddc71ce949a87b8c3b4d8c06ede7ed35..0bfa7fd164be3810a3c4bd64cf51d61025e2fbde 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # mhh <marian.hvolka@stuba.sk>, 2013
+# martin, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-30 09:33-0400\n"
+"PO-Revision-Date: 2013-08-28 18:40+0000\n"
+"Last-Translator: martin\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"
@@ -23,11 +24,11 @@ msgstr ""
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "Aplikácia \"%s\" nemôže byť nainštalovaná kvôli nekompatibilite z danou verziou ownCloudu."
 
 #: app.php:250
 msgid "No app name specified"
-msgstr ""
+msgstr "Nešpecifikované meno aplikácie"
 
 #: app.php:361
 msgid "Help"
@@ -87,59 +88,59 @@ msgstr "Stiahnite súbory po menších častiach, samostatne, alebo sa obráťte
 
 #: installer.php:63
 msgid "No source specified when installing app"
-msgstr ""
+msgstr "Nešpecifikovaný zdroj pri inštalácii aplikácie"
 
 #: installer.php:70
 msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Nešpecifikovaný atribút \"href\" pri inštalácii aplikácie pomocou protokolu \"http\""
 
 #: installer.php:75
 msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Nešpecifikovaná cesta pri inštalácii aplikácie z lokálneho súboru"
 
 #: installer.php:89
 #, php-format
 msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Typ archívu %s nie je podporovaný"
 
 #: installer.php:103
 msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Zlyhanie pri otváraní archívu počas inštalácie aplikácie"
 
 #: installer.php:123
 msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "Aplikácia neposkytuje súbor info.xml"
 
 #: installer.php:129
 msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Aplikácia nemôže byť inštalovaná pre nepovolený kód v aplikácii"
 
 #: installer.php:138
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
-msgstr ""
+msgstr "Aplikácia nemôže byť inštalovaná pre nekompatibilitu z danou verziou ownCloudu"
 
 #: installer.php:144
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
-msgstr ""
+msgstr "Aplikácia nemôže byť inštalovaná pretože obsahuje <shipped>pravý</shipped> štítok, ktorý nie je povolený pre zaslané \"shipped\" aplikácie"
 
 #: installer.php:150
 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 ""
+msgstr "Aplikácia nemôže byť inštalovaná pretože verzia v info.xml/version nezodpovedá verzii špecifikovanej v aplikačnom obchode"
 
 #: installer.php:160
 msgid "App directory already exists"
-msgstr ""
+msgstr "Aplikačný adresár už existuje"
 
 #: installer.php:173
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Nemožno vytvoriť aplikačný priečinok. Prosím upravte povolenia. %s"
 
 #: json.php:28
 msgid "Application is not enabled"
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 456e726abfd23f308cccc84a3c93e35e4e90ef5b..809ca007cb64089cbf444dbd2bf00b710a1764a2 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # mhh <marian.hvolka@stuba.sk>, 2013
+# martin, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-30 09:33-0400\n"
+"PO-Revision-Date: 2013-08-28 18:11+0000\n"
+"Last-Translator: martin\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"
@@ -85,47 +86,47 @@ msgstr "Nie je možné odstrániť používateľa zo skupiny %s"
 msgid "Couldn't update app."
 msgstr "Nemožno aktualizovať aplikáciu."
 
-#: js/apps.js:35
+#: js/apps.js:43
 msgid "Update to {appversion}"
 msgstr "Aktualizovať na {appversion}"
 
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
 msgid "Disable"
 msgstr "Zakázať"
 
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
 msgid "Enable"
 msgstr "Zapnúť"
 
-#: js/apps.js:63
+#: js/apps.js:71
 msgid "Please wait...."
 msgstr "Čakajte prosím..."
 
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
 msgid "Error while disabling app"
-msgstr ""
+msgstr "Chyba pri zablokovaní aplikácie"
 
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
 msgid "Error while enabling app"
-msgstr ""
+msgstr "Chyba pri povoľovaní aplikácie"
 
-#: js/apps.js:115
+#: js/apps.js:123
 msgid "Updating...."
 msgstr "Aktualizujem..."
 
-#: js/apps.js:118
+#: js/apps.js:126
 msgid "Error while updating app"
 msgstr "chyba pri aktualizácii aplikácie"
 
-#: js/apps.js:118
+#: js/apps.js:126
 msgid "Error"
 msgstr "Chyba"
 
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
 msgid "Update"
 msgstr "Aktualizovať"
 
-#: js/apps.js:122
+#: js/apps.js:130
 msgid "Updated"
 msgstr "Aktualizované"
 
@@ -480,7 +481,7 @@ msgstr "Å ifrovanie"
 
 #: templates/personal.php:119
 msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr ""
+msgstr "Šifrovacia aplikácia nie je povolená, dešifrujte všetky vaše súbory"
 
 #: templates/personal.php:125
 msgid "Log-in password"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 0c495d4dbcc64e0903ad25001eac23325499e33f..df53e53b608a1f764516f6c0d8e536cfba6f16f8 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # mhh <marian.hvolka@stuba.sk>, 2013
+# martin, 2013
 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"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-28 18:21+0000\n"
+"Last-Translator: martin\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"
@@ -156,7 +157,7 @@ msgstr "Filter prihlásenia používateľov"
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action. Example: \"uid=%%uid\""
-msgstr ""
+msgstr "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahradzuje používateľské meno v činnosti prihlásenia. Napríklad: \"uid=%%uid\""
 
 #: templates/settings.php:55
 msgid "User List Filter"
@@ -166,7 +167,7 @@ msgstr "Filter zoznamov používateľov"
 msgid ""
 "Defines the filter to apply, when retrieving users (no placeholders). "
 "Example: \"objectClass=person\""
-msgstr ""
+msgstr "Definuje použitý filter, pri získavaní používateľov (bez \"placeholderov\"). Napríklad: \"objectClass=osoba\""
 
 #: templates/settings.php:59
 msgid "Group Filter"
@@ -176,7 +177,7 @@ msgstr "Filter skupiny"
 msgid ""
 "Defines the filter to apply, when retrieving groups (no placeholders). "
 "Example: \"objectClass=posixGroup\""
-msgstr ""
+msgstr "Definuje použitý filter, pri získavaní skupín (bez \"placeholderov\"). Napríklad: \"objectClass=posixSkupina\""
 
 #: templates/settings.php:66
 msgid "Connection Settings"
@@ -237,7 +238,7 @@ msgstr "Vypnúť overovanie SSL certifikátu."
 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 ""
+msgstr "Neodporúčané, použite iba pri testovaní! Pokiaľ spojenie funguje iba z daným nastavením, importujte SSL certifikát LDAP servera do vášho %s servera."
 
 #: templates/settings.php:76
 msgid "Cache Time-To-Live"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 52899493b69f3a36c79af882118fff485710df5f..fa6ea1ad8602327b3ae80bebcb544cfa24074db5 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -24,6 +24,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s je delil »%s« z vami"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Vrsta kategorije ni podana."
@@ -203,23 +232,23 @@ msgstr "lansko leto"
 msgid "years ago"
 msgstr "let nazaj"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Izbor"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "Napaka pri nalaganju predloge za izbor dokumenta"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Da"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Ne"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "V redu"
 
@@ -452,7 +481,7 @@ msgstr "Osebno"
 msgid "Users"
 msgstr "Uporabniki"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Programi"
 
@@ -585,10 +614,6 @@ msgstr "%s je na voljo. Pridobite več podrobnosti za posodobitev."
 msgid "Log out"
 msgstr "Odjava"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Samodejno prijavljanje je zavrnjeno!"
@@ -603,19 +628,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Ali ste pozabili geslo?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "zapomni si"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Prijava"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Druge prijavne možnosti"
 
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 693f82abed72228af6665a3b56f16cbff102ca02..1428fd2d73410a12f1305fef59207e3029d6a52c 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +75,11 @@ msgstr "Pisanje na disk je spodletelo"
 msgid "Not enough storage available"
 msgstr "Na voljo ni dovolj prostora"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Neveljavna mapa."
 
@@ -95,21 +99,20 @@ msgstr "Na voljo ni dovolj prostora."
 msgid "Upload cancelled."
 msgstr "Pošiljanje je preklicano."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "Naslov URL ne sme biti prazna vrednost."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 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:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Napaka"
 
@@ -125,35 +128,55 @@ msgstr "Izbriši dokončno"
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "V čakanju ..."
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} že obstaja"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "zamenjaj"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "predlagaj ime"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "prekliči"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "preimenovano ime {new_name} z imenom {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "razveljavi"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -161,7 +184,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "poteka pošiljanje datotek"
 
@@ -199,38 +222,18 @@ msgid ""
 "big."
 msgstr "Postopek priprave datoteke za prejem je lahko dolgotrajen, če je datoteka zelo velika."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Neveljavno ime mape. Uporaba oznake \"Souporaba\" je zadržan za sistem ownCloud."
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -334,22 +337,6 @@ msgstr "Poteka preučevanje datotek, počakajte ..."
 msgid "Current scanning"
 msgstr "Trenutno poteka preučevanje"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "direktorij"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "direktoriji"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "datoteka"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "datoteke"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Nadgrajevanje predpomnilnika datotečnega sistema ..."
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index 178c2c97e1016d6ffa7e2af6efaddb820ce49bfa..5b7abe91daa6e40d179a1616160014fded472d2e 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -24,6 +24,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Mungon tipi i kategorisë."
@@ -195,23 +224,23 @@ msgstr "vitin e shkuar"
 msgid "years ago"
 msgstr "vite më parë"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Zgjidh"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "Veprim i gabuar gjatë ngarkimit të modelit të zgjedhësit të skedarëve"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Po"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Jo"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Në rregull"
 
@@ -444,7 +473,7 @@ msgstr "Personale"
 msgid "Users"
 msgstr "Përdoruesit"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "App"
 
@@ -577,10 +606,6 @@ msgstr ""
 msgid "Log out"
 msgstr "Dalje"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Hyrja automatike u refuzua!"
@@ -595,19 +620,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Ke humbur kodin?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "kujto"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Hyrje"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Hyrje alternative"
 
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index ace7c037e64b47e236fc8843100f74724b92eba0..506285caa5a60fbc8cb1f8f1b1862c57c36ab300 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -74,7 +74,11 @@ msgstr "Ruajtja në disk dështoi"
 msgid "Not enough storage available"
 msgstr "Nuk ka mbetur hapësirë memorizimi e mjaftueshme"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Dosje e pavlefshme."
 
@@ -94,21 +98,20 @@ msgstr "Nuk ka hapësirë memorizimi e mjaftueshme"
 msgid "Upload cancelled."
 msgstr "Ngarkimi u anulua."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL-i nuk mund të jetë bosh."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Veprim i gabuar"
 
@@ -124,41 +127,57 @@ msgstr "Elimino përfundimisht"
 msgid "Rename"
 msgstr "Riemërto"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Pezulluar"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} ekziston"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "zëvëndëso"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "sugjero një emër"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "anulo"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "U zëvëndësua {new_name} me {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "anulo"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "po ngarkoj skedarët"
 
@@ -196,34 +215,18 @@ msgid ""
 "big."
 msgstr "Shkarkimi juaj po përgatitet. Mund të duhet pak kohë nqse skedarët janë të mëdhenj."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Emri i dosjes është i pavlefshëm. Përdorimi i \"Shared\" është i rezervuar nga Owncloud-i."
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Emri"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Dimensioni"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Modifikuar"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -327,22 +330,6 @@ msgstr "Skedarët po analizohen, ju lutemi pritni."
 msgid "Current scanning"
 msgstr "Analizimi aktual"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Po përmirësoj memorjen e filesystem-it..."
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 66d804028042f22396baf42aa769248d86e43f7c..be1b85599a1fde006aa99e7e9b74daf4aa708c00 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Врста категорије није унет."
@@ -197,23 +226,23 @@ msgstr "прошле године"
 msgid "years ago"
 msgstr "година раније"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Одабери"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Да"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Не"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "У реду"
 
@@ -446,7 +475,7 @@ msgstr "Лично"
 msgid "Users"
 msgstr "Корисници"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Апликације"
 
@@ -579,10 +608,6 @@ msgstr ""
 msgid "Log out"
 msgstr "Одјава"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Аутоматска пријава је одбијена!"
@@ -597,19 +622,19 @@ msgstr "Ако ускоро не промените лозинку ваш нал
 msgid "Please change your password to secure your account again."
 msgstr "Промените лозинку да бисте обезбедили налог."
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Изгубили сте лозинку?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "упамти"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Пријава"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 55f54da7a6fea41b63727d12b7c9ff672298c37d..c5f4089097ccb163a115b570e2c130f0e07648cc 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +74,11 @@ msgstr "Не могу да пишем на диск"
 msgid "Not enough storage available"
 msgstr "Нема довољно простора"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "неисправна фасцикла."
 
@@ -94,21 +98,20 @@ msgstr "Нема довољно простора"
 msgid "Upload cancelled."
 msgstr "Отпремање је прекинуто."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање."
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "Адреса не може бити празна."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Грешка"
 
@@ -124,42 +127,60 @@ msgstr "Обриши за стално"
 msgid "Rename"
 msgstr "Преименуј"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "На чекању"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} већ постоји"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "замени"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "предложи назив"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "откажи"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "замењено {new_name} са {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "опозови"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "датотеке се отпремају"
 
@@ -197,36 +218,18 @@ msgid ""
 "big."
 msgstr "Припремам преузимање. Ово може да потраје ако су датотеке велике."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Неисправно име фасцикле. Фасцикла „Shared“ је резервисана за ownCloud."
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Величина"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Измењено"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -330,22 +333,6 @@ msgstr "Скенирам датотеке…"
 msgid "Current scanning"
 msgstr "Тренутно скенирање"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Дограђујем кеш система датотека…"
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 8a0873def51418e5d9dd426d7f57ee6b5717f5c7..d4e845dc023743338dc492b14bc50676736c096e 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -197,23 +226,23 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr ""
 
@@ -446,7 +475,7 @@ msgstr "Lično"
 msgid "Users"
 msgstr "Korisnici"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Programi"
 
@@ -579,10 +608,6 @@ msgstr ""
 msgid "Log out"
 msgstr "Odjava"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -597,19 +622,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Izgubili ste lozinku?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "upamti"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index a24a15a621e431cb98e0674cbdf9d03cedd34848..429c1a1d2f636d89e7297d1128b9970491af2cc4 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +74,11 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr ""
 
@@ -124,42 +127,60 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -197,36 +218,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Zadnja izmena"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -330,22 +333,6 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 84c312d3d20cdb659aa4bb365bb0cf9c73119f1b..0147f55088eaeddc49b57f5b418d2291b07761d9 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -26,6 +26,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s delade »%s« med dig"
 
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr "Aktiverade underhållsläge"
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr "Deaktiverade underhållsläge"
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr "Uppdaterade databasen"
+
+#: ajax/update.php:20
+msgid "Updating filecache, this may take really long..."
+msgstr "Uppdaterar filcache, det kan ta lång tid..."
+
+#: ajax/update.php:23
+msgid "Updated filecache"
+msgstr "Uppdaterade filcache"
+
+#: ajax/update.php:26
+#, php-format
+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."
@@ -197,23 +226,23 @@ msgstr "förra året"
 msgid "years ago"
 msgstr "Ã¥r sedan"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Välj"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "Fel vid inläsning av filväljarens mall"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Nej"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Ok"
 
@@ -446,7 +475,7 @@ msgstr "Personligt"
 msgid "Users"
 msgstr "Användare"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Program"
 
@@ -579,10 +608,6 @@ msgstr "%s är tillgänglig. Få mer information om hur du går tillväga för a
 msgid "Log out"
 msgstr "Logga ut"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Fler appar"
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatisk inloggning inte tillåten!"
@@ -597,19 +622,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Glömt ditt lösenord?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "kom ihåg"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Logga in"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Alternativa inloggningar"
 
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index dbc15ef9f339e8c8f395712737571de7ea3af1ef..00cbd7f1a36e1359e058b83049e4c62848f54876 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/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-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-19 20:40+0000\n"
-"Last-Translator: medialabs\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -78,7 +78,11 @@ msgstr "Misslyckades spara till disk"
 msgid "Not enough storage available"
 msgstr "Inte tillräckligt med lagringsutrymme tillgängligt"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Felaktig mapp."
 
@@ -98,21 +102,20 @@ msgstr "Inte tillräckligt med utrymme tillgängligt"
 msgid "Upload cancelled."
 msgstr "Uppladdning avbruten."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:234 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL kan inte vara tom."
 
-#: js/file-upload.js:239 lib/app.php:53
+#: js/file-upload.js:244 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:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Fel"
 
@@ -128,41 +131,57 @@ msgstr "Radera permanent"
 msgid "Rename"
 msgstr "Byt namn"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Väntar"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} finns redan"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "ersätt"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "föreslå namn"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "ersatt {new_name} med {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "Ã¥ngra"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n mapp"
+msgstr[1] "%n mappar"
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n fil"
+msgstr[1] "%n filer"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Laddar upp %n fil"
 msgstr[1] "Laddar upp %n filer"
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "filer laddas upp"
 
@@ -200,34 +219,18 @@ msgid ""
 "big."
 msgstr "Din nedladdning förbereds. Det kan ta tid om det är stora filer."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Ogiltigt mappnamn. Användande av 'Shared' är reserverat av ownCloud"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Storlek"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Ändrad"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n mapp"
-msgstr[1] "%n mappar"
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n fil"
-msgstr[1] "%n filer"
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -331,22 +334,6 @@ msgstr "Filer skannas, var god vänta"
 msgid "Current scanning"
 msgstr "Aktuell skanning"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "mapp"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "mappar"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fil"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "filer"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Uppgraderar filsystemets cache..."
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index 3230a1c404b05117e5dbf433946f46eb86f1c3e6..68d9e0761320cb8415d12c5a05ea5240d919c49a 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # medialabs, 2013
+# Magnus Höglund <magnus@linux.com>, 2013
 # medialabs, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-30 09:33-0400\n"
+"PO-Revision-Date: 2013-08-28 12:10+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.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"
@@ -24,11 +25,11 @@ msgstr ""
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "Appen \"%s\" kan inte installeras eftersom att den inte är kompatibel med denna version av ownCloud."
 
 #: app.php:250
 msgid "No app name specified"
-msgstr ""
+msgstr "Inget appnamn angivet"
 
 #: app.php:361
 msgid "Help"
@@ -88,59 +89,59 @@ msgstr "Ladda ner filerna i mindre bitar, separat eller fråga din administratö
 
 #: installer.php:63
 msgid "No source specified when installing app"
-msgstr ""
+msgstr "Ingen källa angiven vid installation av app "
 
 #: installer.php:70
 msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Ingen href angiven vid installation av app från http"
 
 #: installer.php:75
 msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Ingen sökväg angiven vid installation av app från lokal fil"
 
 #: installer.php:89
 #, php-format
 msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Arkiv av typen %s stöds ej"
 
 #: installer.php:103
 msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Kunde inte öppna arkivet när appen skulle installeras"
 
 #: installer.php:123
 msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "Appen har ingen info.xml fil"
 
 #: installer.php:129
 msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Appen kan inte installeras eftersom att den innehåller otillåten kod"
 
 #: installer.php:138
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
-msgstr ""
+msgstr "Appen kan inte installeras eftersom att den inte är kompatibel med denna version av ownCloud"
 
 #: installer.php:144
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
-msgstr ""
+msgstr "Appen kan inte installeras eftersom att den innehåller etiketten <shipped>true</shipped> vilket inte är tillåtet för icke inkluderade appar"
 
 #: installer.php:150
 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 ""
+msgstr "Appen kan inte installeras eftersom versionen i info.xml inte är samma som rapporteras från app store"
 
 #: installer.php:160
 msgid "App directory already exists"
-msgstr ""
+msgstr "Appens mapp finns redan"
 
 #: installer.php:173
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Kan inte skapa appens mapp. Var god åtgärda rättigheterna. %s"
 
 #: json.php:28
 msgid "Application is not enabled"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 4c57d855cc26a0900f624a1635be3a4103e9272b..d2f922829336abe952ff345abee80485173d9652 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-28 06:22-0400\n"
+"PO-Revision-Date: 2013-08-28 10:20+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.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"
@@ -108,11 +108,11 @@ msgstr "Var god vänta..."
 
 #: js/apps.js:71 js/apps.js:72 js/apps.js:92
 msgid "Error while disabling app"
-msgstr ""
+msgstr "Fel vid inaktivering av app"
 
 #: js/apps.js:91 js/apps.js:104 js/apps.js:105
 msgid "Error while enabling app"
-msgstr ""
+msgstr "Fel vid aktivering av app"
 
 #: js/apps.js:115
 msgid "Updating...."
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index f29bad549d307efbaf4e5867145e912bc0ac3631..fe62bebfde0d5f4177e66ced027f9d72d27758c9 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-28 11:40+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.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"
@@ -158,7 +158,7 @@ msgstr "Filter logga in användare"
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action. Example: \"uid=%%uid\""
-msgstr ""
+msgstr "Definierar filter som tillämpas vid inloggning. %%uid ersätter användarnamn vid inloggningen. Exempel: \"uid=%%uid\""
 
 #: templates/settings.php:55
 msgid "User List Filter"
@@ -168,7 +168,7 @@ msgstr "Filter lista användare"
 msgid ""
 "Defines the filter to apply, when retrieving users (no placeholders). "
 "Example: \"objectClass=person\""
-msgstr ""
+msgstr "Definierar filter som tillämpas vid sökning efter användare (inga platshållare). Exempel: \"objectClass=person\""
 
 #: templates/settings.php:59
 msgid "Group Filter"
@@ -178,7 +178,7 @@ msgstr "Gruppfilter"
 msgid ""
 "Defines the filter to apply, when retrieving groups (no placeholders). "
 "Example: \"objectClass=posixGroup\""
-msgstr ""
+msgstr "Definierar filter som tillämpas vid sökning efter grupper (inga platshållare). Exempel: \"objectClass=posixGroup\""
 
 #: templates/settings.php:66
 msgid "Connection Settings"
@@ -239,7 +239,7 @@ msgstr "Stäng av verifiering av SSL-certifikat."
 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 ""
+msgstr "Rekommenderas inte, använd endast för test! Om anslutningen bara fungerar med denna inställning behöver du importera LDAP-serverns SSL-certifikat till din %s server."
 
 #: templates/settings.php:76
 msgid "Cache Time-To-Live"
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index e974dc0ec23138b74da67f64cf3d3551b1475075..1dec294805d308dc4fabe3c4a4878f0373b4f449 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -193,23 +222,23 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr ""
 
@@ -442,7 +471,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr ""
 
@@ -575,10 +604,6 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -593,19 +618,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/sw_KE/files.po b/l10n/sw_KE/files.po
index 66f0fff9e7847a360181165e030e9f76e4a42a77..f32f2a01fde8240f0182defc699ae1ec827973b0 100644
--- a/l10n/sw_KE/files.po
+++ b/l10n/sw_KE/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -74,7 +74,11 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr ""
 
@@ -124,41 +127,57 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -196,34 +215,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -327,22 +330,6 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index 2ef228556c5ec4e9af63107f6a7d721333376c9e..71c2bdbf22dc1ed0ca7b8647048d4255ad0b3944 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "பிரிவு வகைகள் வழங்கப்படவில்லை"
@@ -193,23 +222,23 @@ msgstr "கடந்த வருடம்"
 msgid "years ago"
 msgstr "வருடங்களுக்கு முன்"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "தெரிவுசெய்க "
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "ஆம்"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "இல்லை"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "சரி"
 
@@ -442,7 +471,7 @@ msgstr "தனிப்பட்ட"
 msgid "Users"
 msgstr "பயனாளர்"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "செயலிகள்"
 
@@ -575,10 +604,6 @@ msgstr ""
 msgid "Log out"
 msgstr "விடுபதிகை செய்க"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "தன்னிச்சையான புகுபதிகை நிராகரிப்பட்டது!"
@@ -593,19 +618,19 @@ msgstr "உங்களுடைய கடவுச்சொல்லை அண
 msgid "Please change your password to secure your account again."
 msgstr "உங்களுடைய கணக்கை மீண்டும் பாதுகாக்க தயவுசெய்து உங்களுடைய கடவுச்சொல்லை மாற்றவும்."
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "உங்கள் கடவுச்சொல்லை தொலைத்துவிட்டீர்களா?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "ஞாபகப்படுத்துக"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "புகுபதிகை"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index c724be397554ca5af2e2b60e175ba9ae58f2ff55..9bc657e7df466eb7c742a186ef24dd7c65429d35 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +74,11 @@ msgstr "வட்டில் எழுத முடியவில்லை"
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது"
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்."
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL  வெறுமையாக இருக்கமுடியாது."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "வழு"
 
@@ -124,41 +127,57 @@ msgstr ""
 msgid "Rename"
 msgstr "பெயர்மாற்றம்"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "நிலுவையிலுள்ள"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} ஏற்கனவே உள்ளது"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "மாற்றிடுக"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "பெயரை பரிந்துரைக்க"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "இரத்து செய்க"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "முன் செயல் நீக்கம் "
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -196,34 +215,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "பெயர்"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "அளவு"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "மாற்றப்பட்டது"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -327,22 +330,6 @@ msgstr "கோப்புகள் வருடப்படுகின்ற
 msgid "Current scanning"
 msgstr "தற்போது வருடப்படுபவை"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/te/core.po b/l10n/te/core.po
index 97198eda635724dfea154e93dc9a0cab5096f705..2101fe896a75b46fabab34faa44ace085385cdd0 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -193,23 +222,23 @@ msgstr "పోయిన సంవత్సరం"
 msgid "years ago"
 msgstr "సంవత్సరాల క్రితం"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "అవును"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "కాదు"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "సరే"
 
@@ -442,7 +471,7 @@ msgstr ""
 msgid "Users"
 msgstr "వాడుకరులు"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr ""
 
@@ -575,10 +604,6 @@ msgstr ""
 msgid "Log out"
 msgstr "నిష్క్రమించు"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -593,19 +618,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "మీ సంకేతపదం పోయిందా?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/te/files.po b/l10n/te/files.po
index b9310e4f508171f8a2efe9486792cbeb7734d446..f414cfe474d2b1e9801a8c57b7b1ed47dc7759d4 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +74,11 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "పొరపాటు"
 
@@ -124,41 +127,57 @@ msgstr "శాశ్వతంగా తొలగించు"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "రద్దుచేయి"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -196,34 +215,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "పేరు"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "పరిమాణం"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -327,22 +330,6 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 48e097aef836b22f5b244acef8ac2e496d3fe5bd..f9ccbd0049d3ddffa91d324694d2ef58e80e5925 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
+"POT-Creation-Date: 2013-08-30 09:32-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"
@@ -23,6 +23,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -443,7 +472,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr ""
 
@@ -576,10 +605,6 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -594,19 +619,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 72f42768dbb0656477278be0c91e89d461df6131..be393c44928d5014e039b174f401c2d94b2c358f 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
+"POT-Creation-Date: 2013-08-30 09:31-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,7 +75,11 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -95,21 +99,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:234 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:239 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr ""
 
@@ -125,41 +128,57 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -197,34 +216,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -328,22 +331,6 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 455133b4394a43cff0ed4f99231ddec290b63790..06a88da5450952ea09a66f439e3015ca0aa263f9 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
+"POT-Creation-Date: 2013-08-30 09:31-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_external.pot b/l10n/templates/files_external.pot
index a0988bcf744b9f99169a985a72c3c0ce8ad906f1..79b7984dd1868cae8f50f7c381cadc89001379ef 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
+"POT-Creation-Date: 2013-08-30 09:32-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 30e7521c201ea6bbdc255f8f8b95bdaa086fa6f0..4cfc080a083c31c16dbecae044f6200ac0cff194 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
+"POT-Creation-Date: 2013-08-30 09:32-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_trashbin.pot b/l10n/templates/files_trashbin.pot
index 880f2dc9bbb4027b3b80e1e8eeadfda99411f4b7..ed36dd2e0d3e7a35888ff3f628188122dc37e71d 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
+"POT-Creation-Date: 2013-08-30 09:32-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"
@@ -28,43 +28,43 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:100
+#: js/trash.js:7 js/trash.js:102
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:36
+#: js/trash.js:37
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:127
+#: js/trash.js:129
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:182 templates/index.php:17
+#: js/trash.js:184 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:185 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:191
+#: js/trash.js:193
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/trash.js:197
+#: js/trash.js:199
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trash.php:814 lib/trash.php:816
 msgid "restored"
 msgstr ""
 
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index f1852eea3378048e0a4f799761767192cc0a585a..5576a3f45bccb231f1cc6c5e28dbad0b078aa32c 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
+"POT-Creation-Date: 2013-08-30 09:32-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 4fd3bc28f346fbcf3f4b54e9f350f81bb9261c7f..16f93542555c85fa818d20d5a2b5d3bf4648c10d 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
+"POT-Creation-Date: 2013-08-30 09:33-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/settings.pot b/l10n/templates/settings.pot
index 6c6ee1f16d3afc24b62edabf14d8ab5f74b2b148..33409afcebbf8e2148d34f36496356ccb2865950 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
+"POT-Creation-Date: 2013-08-30 09:33-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"
@@ -84,47 +84,47 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:35
+#: js/apps.js:43
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:63
+#: js/apps.js:71
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:115
+#: js/apps.js:123
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:118
+#: js/apps.js:126
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:118
+#: js/apps.js:126
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:122
+#: js/apps.js:130
 msgid "Updated"
 msgstr ""
 
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index d831294224813585006955adfdad4d05b73d72fb..32ba6b4a95d59aa7b435882014708291ef623bb6 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
+"POT-Creation-Date: 2013-08-30 09:32-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/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 91adffa046470f8a0749e39e2eeb0366fc5ef724..04f405c7392c22868e1405bb6612f7e9e640f68d 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
+"POT-Creation-Date: 2013-08-30 09:32-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 61826ac4db1978e74ed9dcf0c710c144d0a9dda8..d1e093aba8911c23f8f40b0405c5668bf249ecbf 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "ยังไม่ได้ระบุชนิดของหมวดหมู่"
@@ -189,23 +218,23 @@ msgstr "ปีที่แล้ว"
 msgid "years ago"
 msgstr "ปี ที่ผ่านมา"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "เลือก"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "ตกลง"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "ไม่ตกลง"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "ตกลง"
 
@@ -438,7 +467,7 @@ msgstr "ส่วนตัว"
 msgid "Users"
 msgstr "ผู้ใช้งาน"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "แอปฯ"
 
@@ -571,10 +600,6 @@ msgstr ""
 msgid "Log out"
 msgstr "ออกจากระบบ"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "การเข้าสู่ระบบอัตโนมัติถูกปฏิเสธแล้ว"
@@ -589,19 +614,19 @@ msgstr "หากคุณยังไม่ได้เปลี่ยนรห
 msgid "Please change your password to secure your account again."
 msgstr "กรุณาเปลี่ยนรหัสผ่านของคุณอีกครั้ง เพื่อป้องกันบัญชีของคุณให้ปลอดภัย"
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "ลืมรหัสผ่าน?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "จำรหัสผ่าน"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "เข้าสู่ระบบ"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 00ad518a13b41a6293c86c9e268c6da50e69e86d..800c07574fa36607a0d374e1e49087765959e3a3 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +74,11 @@ msgstr "เขียนข้อมูลลงแผ่นดิสก์ล้
 msgid "Not enough storage available"
 msgstr "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "ไดเร็กทอรี่ไม่ถูกต้อง"
 
@@ -94,21 +98,20 @@ msgstr "มีพื้นที่เหลือไม่เพียงพอ
 msgid "Upload cancelled."
 msgstr "การอัพโหลดถูกยกเลิก"
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก"
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL ไม่สามารถเว้นว่างได้"
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
@@ -124,40 +127,54 @@ msgstr ""
 msgid "Rename"
 msgstr "เปลี่ยนชื่อ"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "อยู่ระหว่างดำเนินการ"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} มีอยู่แล้วในระบบ"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "แทนที่"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "แนะนำชื่อ"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "ยกเลิก"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "แทนที่ {new_name} ด้วย {old_name} แล้ว"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "เลิกทำ"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "การอัพโหลดไฟล์"
 
@@ -195,32 +212,18 @@ msgid ""
 "big."
 msgstr "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่"
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "ชื่อโฟลเดอร์ไม่ถูกต้อง การใช้งาน 'แชร์' สงวนไว้สำหรับ Owncloud เท่านั้น"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "ชื่อ"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "ขนาด"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "แก้ไขแล้ว"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -324,22 +327,6 @@ msgstr "ไฟล์กำลังอยู่ระหว่างการส
 msgid "Current scanning"
 msgstr "ไฟล์ที่กำลังสแกนอยู่ขณะนี้"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "ไฟล์"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "ไฟล์"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "กำลังอัพเกรดหน่วยความจำแคชของระบบไฟล์..."
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 2605b398b3fb03ae04f56b1e50adf357211f8a04..ad793be7d81e57631e699dc8bcae7d99a4e3bdea 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -24,6 +24,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s  sizinle »%s« paylaşımında bulundu"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Kategori türü girilmedi."
@@ -195,23 +224,23 @@ msgstr "geçen yıl"
 msgid "years ago"
 msgstr "yıl önce"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "seç"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "Seçici şablon dosya yüklemesinde hata"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Evet"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Hayır"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Tamam"
 
@@ -444,7 +473,7 @@ msgstr "KiÅŸisel"
 msgid "Users"
 msgstr "Kullanıcılar"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Uygulamalar"
 
@@ -577,10 +606,6 @@ msgstr "%s mevcuttur. Güncelleştirme hakkında daha fazla bilgi alın."
 msgid "Log out"
 msgstr "Çıkış yap"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Daha fazla Uygulama"
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Otomatik oturum açma reddedildi!"
@@ -595,19 +620,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Parolanızı mı unuttunuz?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "hatırla"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "GiriÅŸ yap"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Alternatif GiriÅŸler"
 
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 28cd5fa42a750acbc06e52b0a361d385e40143be..ec4947bf1e3aaebfda27736d3b79459042eb1a6f 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/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-08-23 20:15-0400\n"
-"PO-Revision-Date: 2013-08-22 16:50+0000\n"
-"Last-Translator: alicanbatur <alicanbatur@hotmail.com>\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -77,7 +77,11 @@ msgstr "Diske yazılamadı"
 msgid "Not enough storage available"
 msgstr "Yeterli disk alanı yok"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Geçersiz dizin."
 
@@ -97,21 +101,20 @@ msgstr "Yeterli disk alanı yok"
 msgid "Upload cancelled."
 msgstr "Yükleme iptal edildi."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:234 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL boÅŸ olamaz."
 
-#: js/file-upload.js:239 lib/app.php:53
+#: js/file-upload.js:244 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:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Hata"
 
@@ -127,41 +130,57 @@ msgstr "Kalıcı olarak sil"
 msgid "Rename"
 msgstr "Ä°sim deÄŸiÅŸtir."
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Bekliyor"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} zaten mevcut"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "deÄŸiÅŸtir"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "Öneri ad"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "iptal"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} ismi {old_name} ile deÄŸiÅŸtirildi"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "geri al"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n dizin"
+msgstr[1] "%n dizin"
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n dosya"
+msgstr[1] "%n dosya"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n dosya yükleniyor"
 msgstr[1] "%n dosya yükleniyor"
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "Dosyalar yükleniyor"
 
@@ -199,34 +218,18 @@ msgid ""
 "big."
 msgstr "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Geçersiz dizin adı. Shared isminin kullanımı Owncloud tarafından rezerver edilmiştir."
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Ä°sim"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Boyut"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "DeÄŸiÅŸtirilme"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n dizin"
-msgstr[1] "%n dizin"
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n dosya"
-msgstr[1] "%n dosya"
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -330,22 +333,6 @@ msgstr "Dosyalar taranıyor, lütfen bekleyin."
 msgid "Current scanning"
 msgstr "Güncel tarama"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "dizin"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "dizinler"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "dosya"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "dosyalar"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Sistem dosyası önbelleği güncelleniyor"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index 6c7882b928a0af7436a62c670be917d48624e802..45e5b713bb1d7b3934795e39390950295a1c4301 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/lib.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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-27 11:40+0000\n"
+"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,11 +24,11 @@ msgstr ""
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "Owncloud yazılımının bu sürümü ile uyumlu  olmadığı için \"%s\" uygulaması kurulamaz."
 
 #: app.php:250
 msgid "No app name specified"
-msgstr ""
+msgstr "Uygulama adı belirtimedli"
 
 #: app.php:361
 msgid "Help"
@@ -88,59 +88,59 @@ msgstr "Dosyaları ayrı ayrı, küçük parçalar halinde indirin ya da yöneti
 
 #: installer.php:63
 msgid "No source specified when installing app"
-msgstr ""
+msgstr "Uygulama kurulurken bir kaynak belirtilmedi"
 
 #: installer.php:70
 msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Uygulama kuruluyorken http'de href belirtilmedi."
 
 #: installer.php:75
 msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Uygulama yerel dosyadan kuruluyorken dosya yolu belirtilmedi"
 
 #: installer.php:89
 #, php-format
 msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "%s arÅŸiv tipi desteklenmiyor"
 
 #: installer.php:103
 msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Uygulama kuruluyorken arşiv dosyası açılamadı"
 
 #: installer.php:123
 msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "Uygulama info.xml dosyası sağlamıyor"
 
 #: installer.php:129
 msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Uygulamada izin verilmeyeden kodlar olduğu için kurulamıyor."
 
 #: installer.php:138
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
-msgstr ""
+msgstr "Owncloud versiyonunuz ile uyumsuz olduğu için uygulama kurulamıyor."
 
 #: installer.php:144
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
-msgstr ""
+msgstr "Uygulama kurulamıyor. Çünkü  \"non shipped\" uygulamalar için <shipped>true</shipped> tag içermektedir."
 
 #: installer.php:150
 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 ""
+msgstr "Uygulama kurulamıyor çünkü info.xml/version ile uygulama marketde belirtilen sürüm aynı değil."
 
 #: installer.php:160
 msgid "App directory already exists"
-msgstr ""
+msgstr "App dizini zaten mevcut"
 
 #: installer.php:173
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "app dizini oluşturulamıyor. Lütfen izinleri düzeltin. %s"
 
 #: json.php:28
 msgid "Application is not enabled"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 91c06ffc83bce735ff77ad12f70310a991c93808..ae9145f21209667cdd85ca6d0c10e13f9baf10a2 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -6,13 +6,14 @@
 # DeeJaVu <ddejjavvu@gmail.com>, 2013
 # ismail yenigül <ismail.yenigul@surgate.com>, 2013
 # tridinebandim, 2013
+# volkangezer <volkangezer@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-27 00:50+0000\n"
+"Last-Translator: volkangezer <volkangezer@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"
@@ -105,11 +106,11 @@ msgstr "Lütfen bekleyin...."
 
 #: js/apps.js:71 js/apps.js:72 js/apps.js:92
 msgid "Error while disabling app"
-msgstr ""
+msgstr "Uygulama devre dışı bırakılırken hata"
 
 #: js/apps.js:91 js/apps.js:104 js/apps.js:105
 msgid "Error while enabling app"
-msgstr ""
+msgstr "Uygulama etkinleÅŸtirilirken hata"
 
 #: js/apps.js:115
 msgid "Updating...."
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index 0451be577d550882be7dc04a310385f7d1bd926c..e4e9c2bb89e1fe1135662048ff82577285babdcc 100644
--- a/l10n/ug/core.po
+++ b/l10n/ug/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -189,23 +218,23 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "ھەئە"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "ياق"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "جەزملە"
 
@@ -438,7 +467,7 @@ msgstr "شەخسىي"
 msgid "Users"
 msgstr "ئىشلەتكۈچىلەر"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "ئەپلەر"
 
@@ -480,7 +509,7 @@ msgstr "قوش"
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
-msgstr ""
+msgstr "بىخەتەرلىك ئاگاھلاندۇرۇش"
 
 #: templates/installation.php:25
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
@@ -571,10 +600,6 @@ msgstr ""
 msgid "Log out"
 msgstr "تىزىمدىن چىق"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -589,19 +614,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ug/files.po b/l10n/ug/files.po
index 10586fef152ecabbfcfab51a7da0b016e82b735b..2872d4e43e41a004ce7641f25d16929b03ddd0b3 100644
--- a/l10n/ug/files.po
+++ b/l10n/ug/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -74,7 +74,11 @@ msgstr "دىسكىغا يازالمىدى"
 msgid "Not enough storage available"
 msgstr "يېتەرلىك ساقلاش بوشلۇقى يوق"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr "يېتەرلىك بوشلۇق يوق"
 msgid "Upload cancelled."
 msgstr "يۈكلەشتىن ۋاز كەچتى."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "خاتالىق"
 
@@ -124,40 +127,54 @@ msgstr "مەڭگۈلۈك ئۆچۈر"
 msgid "Rename"
 msgstr "ئات ئۆزگەرت"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "كۈتۈۋاتىدۇ"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} مەۋجۇت"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "ئالماشتۇر"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "تەۋسىيە ئات"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "ۋاز كەچ"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "يېنىۋال"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "ھۆججەت يۈكلىنىۋاتىدۇ"
 
@@ -195,32 +212,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "ئاتى"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "چوڭلۇقى"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "ئۆزگەرتكەن"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -324,22 +327,6 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "ھۆججەت سىستېما غەملىكىنى يۈكسەلدۈرۈۋاتىدۇ…"
diff --git a/l10n/ug/lib.po b/l10n/ug/lib.po
index 3c833cb1694db4085e82424b390bd0867f36f976..f9f9408227a9e91ede3ea1bfbb96032e16075cdc 100644
--- a/l10n/ug/lib.po
+++ b/l10n/ug/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-08-28 06:22-0400\n"
+"PO-Revision-Date: 2013-08-27 17:30+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -257,7 +257,7 @@ msgstr ""
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەڭشەلمەپتۇ، چۈنكى WebDAV نىڭ ئېغىزى بۇزۇلغاندەك تۇرىدۇ."
 
 #: setup.php:185
 #, php-format
diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po
index ee0402683bd60ab73d953ffbf38635e52b711d4c..c1174f807362b7f27b041416d8995760a10b9b4b 100644
--- a/l10n/ug/settings.po
+++ b/l10n/ug/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Abduqadir Abliz <sahran.ug@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-28 06:22-0400\n"
+"PO-Revision-Date: 2013-08-27 17:30+0000\n"
+"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -68,7 +69,7 @@ msgstr "ئىناۋەتسىز ئىلتىماس"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "باشقۇرغۇچى ئۆزىنى باشقۇرۇش گۇرۇپپىسىدىن چىقىرىۋېتەلمەيدۇ"
 
 #: ajax/togglegroups.php:30
 #, php-format
@@ -167,23 +168,23 @@ msgstr "گۇرۇپپا قوش"
 
 #: js/users.js:436
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك"
 
 #: js/users.js:437 js/users.js:443 js/users.js:458
 msgid "Error creating user"
-msgstr ""
+msgstr "ئىشلەتكۈچى قۇرۇۋاتقاندا خاتالىق كۆرۈلدى"
 
 #: js/users.js:442
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك"
 
 #: personal.php:40 personal.php:41
 msgid "__language_name__"
-msgstr ""
+msgstr "ئۇيغۇرچە"
 
 #: templates/admin.php:15
 msgid "Security Warning"
-msgstr ""
+msgstr "بىخەتەرلىك ئاگاھلاندۇرۇش"
 
 #: templates/admin.php:18
 msgid ""
@@ -196,13 +197,13 @@ msgstr ""
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr ""
+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 ""
+msgstr "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەڭشەلمەپتۇ، چۈنكى WebDAV نىڭ ئېغىزى بۇزۇلغاندەك تۇرىدۇ."
 
 #: templates/admin.php:33
 #, php-format
@@ -211,7 +212,7 @@ msgstr ""
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "بۆلەك «ھۆججەت ئۇچۇرى» يوقالغان"
 
 #: templates/admin.php:47
 msgid ""
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index ae0e108f1620d2361b3574796ff8ed3dc2b9d197..5626dcfa66f10d2e0db21847771d09b70826580a 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Не вказано тип категорії."
@@ -197,23 +226,23 @@ msgstr "минулого року"
 msgid "years ago"
 msgstr "роки тому"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Обрати"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Так"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Ні"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Ok"
 
@@ -446,7 +475,7 @@ msgstr "Особисте"
 msgid "Users"
 msgstr "Користувачі"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Додатки"
 
@@ -579,10 +608,6 @@ msgstr ""
 msgid "Log out"
 msgstr "Вихід"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Автоматичний вхід в систему відхилений!"
@@ -597,19 +622,19 @@ msgstr "Якщо Ви не міняли пароль останнім часом
 msgid "Please change your password to secure your account again."
 msgstr "Будь ласка, змініть свій пароль, щоб знову захистити Ваш обліковий запис."
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Забули пароль?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "запам'ятати"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Вхід"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Альтернативні Логіни"
 
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index d348a772f94bfd2c576c815ce0e7ca1308182ca1..b862958c94fc4c003beaa05d875050ea48ea57b1 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +75,11 @@ msgstr "Невдалося записати на диск"
 msgid "Not enough storage available"
 msgstr "Місця більше немає"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Невірний каталог."
 
@@ -95,21 +99,20 @@ msgstr "Місця більше немає"
 msgid "Upload cancelled."
 msgstr "Завантаження перервано."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження."
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL не може бути пустим."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Помилка"
 
@@ -125,42 +128,60 @@ msgstr "Видалити назавжди"
 msgid "Rename"
 msgstr "Перейменувати"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Очікування"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} вже існує"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "заміна"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "запропонуйте назву"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "відміна"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "замінено {new_name} на {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "відмінити"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "файли завантажуються"
 
@@ -198,36 +219,18 @@ msgid ""
 "big."
 msgstr "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Невірне ім'я теки. Використання \"Shared\" зарезервовано Owncloud"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Ім'я"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Розмір"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Змінено"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -331,22 +334,6 @@ msgstr "Файли скануються, зачекайте, будь-ласка
 msgid "Current scanning"
 msgstr "Поточне сканування"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "каталог"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "каталоги"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "файл"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "файли"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Оновлення кеша файлової системи..."
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index 54407785c0505a0571c1c9fe2a8387817faec869..4e063c006816ddbae90b158bdb46a50ae53226b1 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -193,23 +222,23 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "منتخب کریں"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "ہاں"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "نہیں"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "اوکے"
 
@@ -442,7 +471,7 @@ msgstr "ذاتی"
 msgid "Users"
 msgstr "یوزرز"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "ایپز"
 
@@ -575,10 +604,6 @@ msgstr ""
 msgid "Log out"
 msgstr "لاگ آؤٹ"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -593,19 +618,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "کیا آپ پاسورڈ بھول گئے ہیں؟"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "یاد رکھیں"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "لاگ ان"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po
index a8832be5ecca2eda69ff40bad0e766a524d7bec6..e92fc72d7f31c8a6a9af4a8c0a8e26453425a608 100644
--- a/l10n/ur_PK/files.po
+++ b/l10n/ur_PK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -74,7 +74,11 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "ایرر"
 
@@ -124,41 +127,57 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -196,34 +215,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -327,22 +330,6 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 9a6b412143edfd0fecc4e5f30b06ff7eb971dfe3..d7196f3ab9fdd6610abdefd86cc3a3dc9812a4c2 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -23,6 +23,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: 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."
@@ -190,23 +219,23 @@ msgstr "năm trước"
 msgid "years ago"
 msgstr "năm trước"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "Chọn"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Có"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "Không"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "Đồng ý"
 
@@ -439,7 +468,7 @@ msgstr "Cá nhân"
 msgid "Users"
 msgstr "Người dùng"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "Ứng dụng"
 
@@ -572,10 +601,6 @@ msgstr "%s còn trống. Xem thêm thông tin cách cập nhật."
 msgid "Log out"
 msgstr "Đăng xuất"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Tự động đăng nhập đã bị từ chối !"
@@ -590,19 +615,19 @@ 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:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "Bạn quên mật khẩu ?"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "ghi nhá»›"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "Đăng nhập"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "Đăng nhập khác"
 
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index 2d6c28b2d583059f706bde40b1b21272c528b9f1..3d1f24debd6d3bd8678469f4fbdbf910c76fb4b4 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +75,11 @@ msgstr "Không thể ghi "
 msgid "Not enough storage available"
 msgstr "Không đủ không gian lưu trữ"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Thư mục không hợp lệ"
 
@@ -95,21 +99,20 @@ msgstr "Không đủ chỗ trống cần thiết"
 msgid "Upload cancelled."
 msgstr "Hủy tải lên"
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL không được để trống."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "Lá»—i"
 
@@ -125,40 +128,54 @@ msgstr "Xóa vĩnh vễn"
 msgid "Rename"
 msgstr "Sửa tên"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "Đang chờ"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} đã tồn tại"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "thay thế"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "tên gợi ý"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "hủy"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "đã thay thế {new_name} bằng {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "lùi lại"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "tệp tin đang được tải lên"
 
@@ -196,32 +213,18 @@ msgid ""
 "big."
 msgstr "Your download is being prepared. This might take some time if the files are big."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "Tên"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "Kích cỡ"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "Thay đổi"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -325,22 +328,6 @@ msgstr "Tập tin đang được quét ,vui lòng chờ."
 msgid "Current scanning"
 msgstr "Hiện tại đang quét"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "file"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "files"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Đang nâng cấp bộ nhớ đệm cho tập tin hệ thống..."
diff --git a/l10n/zh_CN.GB2312/files_trashbin.po b/l10n/zh_CN.GB2312/files_trashbin.po
deleted file mode 100644
index cef04c5439fa0bcdc89689159b88cbf336ac2a7e..0000000000000000000000000000000000000000
--- a/l10n/zh_CN.GB2312/files_trashbin.po
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-15 10:40+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN.GB2312\n"
-"Plural-Forms: nplurals=1; plural=0;\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: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
-msgid "Error"
-msgstr "出错"
-
-#: js/trash.js:36
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:127
-msgid "Delete permanently"
-msgstr "永久删除"
-
-#: js/trash.js:182 templates/index.php:17
-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] "%n 个文件夹"
-
-#: js/trash.js:197
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n 个文件"
-
-#: lib/trash.php:819 lib/trash.php:821
-msgid "restored"
-msgstr ""
-
-#: templates/index.php:9
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
-
-#: templates/index.php:20 templates/index.php:22
-msgid "Restore"
-msgstr "恢复"
-
-#: templates/index.php:30 templates/index.php:31
-msgid "Delete"
-msgstr "删除"
-
-#: templates/part.breadcrumb.php:9
-msgid "Deleted Files"
-msgstr "删除的文件"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index c516d6a84d5b1a671765a0aa6d9bade19415251d..d05019be94ca8dee57e20e9b936e32e1e6cb8a8c 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Xuetian Weng <wengxt@gmail.com>, 2013
 # zhangmin <zm1990s@gmail.com>, 2013
 # zhangmin <zm1990s@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +25,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s 向您分享了 »%s«"
 
+#: ajax/share.php:227
+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 "...已完成 %d%% ..."
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "未提供分类类型。"
@@ -155,7 +185,7 @@ msgstr[0] "%n 分钟前"
 #: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
+msgstr[0] "%n 小时前"
 
 #: js/js.js:815
 msgid "today"
@@ -168,7 +198,7 @@ msgstr "昨天"
 #: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
-msgstr[0] ""
+msgstr[0] "%n 天前"
 
 #: js/js.js:818
 msgid "last month"
@@ -177,7 +207,7 @@ msgstr "上月"
 #: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
+msgstr[0] "%n 月前"
 
 #: js/js.js:820
 msgid "months ago"
@@ -191,23 +221,23 @@ msgstr "去年"
 msgid "years ago"
 msgstr "年前"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "选择(&C)..."
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "加载文件选择器模板出错"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "是"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "否"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "好"
 
@@ -226,7 +256,7 @@ msgstr "错误"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
-msgstr "未指定App名称。"
+msgstr "未指定应用名称。"
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
@@ -374,7 +404,7 @@ msgstr "更新成功。正在重定向至 ownCloud。"
 #: lostpassword/controller.php:61
 #, php-format
 msgid "%s password reset"
-msgstr ""
+msgstr "重置 %s 的密码"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -440,7 +470,7 @@ msgstr "个人"
 msgid "Users"
 msgstr "用户"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "应用"
 
@@ -491,7 +521,7 @@ msgstr "你的PHP版本容易受到空字节攻击 (CVE-2006-7243)"
 #: templates/installation.php:26
 #, php-format
 msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "为保证安全使用 %s 请更新您的PHP。"
 
 #: templates/installation.php:32
 msgid ""
@@ -516,7 +546,7 @@ msgstr "您的数据目录和文件可能可以直接被互联网访问，因为
 msgid ""
 "For information how to properly configure your server, please see the <a "
 "href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\">此文档</a>。"
 
 #: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
@@ -573,10 +603,6 @@ msgstr "%s 可用。获取更多关于如何升级的信息。"
 msgid "Log out"
 msgstr "注销"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "自动登录被拒绝！"
@@ -591,19 +617,19 @@ msgstr "如果您没有最近修改您的密码，您的帐户可能会受到影
 msgid "Please change your password to secure your account again."
 msgstr "请修改您的密码，以保护您的账户安全。"
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "忘记密码？"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "记住"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "登录"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "其他登录方式"
 
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index f2c016bafb2e35b5f6bd20d0a3c6c4e0a56ace61..fe65471744c61dd5477ddc18096dd85434c0bd01 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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,7 +77,11 @@ msgstr "写入磁盘失败"
 msgid "Not enough storage available"
 msgstr "没有足够的存储空间"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "无效文件夹。"
 
@@ -97,21 +101,20 @@ msgstr "没有足够可用空间"
 msgid "Upload cancelled."
 msgstr "上传已取消"
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL不能为空"
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹"
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "错误"
 
@@ -127,40 +130,54 @@ msgstr "永久删除"
 msgid "Rename"
 msgstr "重命名"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "等待"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} 已存在"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "替换"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "建议名称"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "已将 {old_name}替换成 {new_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n 文件夹"
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n个文件"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "文件上传中"
 
@@ -198,32 +215,18 @@ msgid ""
 "big."
 msgstr "下载正在准备中。如果文件较大可能会花费一些时间。"
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "无效文件夹名。'共享' 是 Owncloud 预留的文件夹名。"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "名称"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n 文件夹"
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n个文件"
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -327,22 +330,6 @@ msgstr "文件正在被扫描，请稍候。"
 msgid "Current scanning"
 msgstr "当前扫描"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "文件"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "文件"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "正在更新文件系统缓存..."
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 28e19119a91e333a4c7dbb091e1e226e5c80554a..08447c650f0a0e2c4fb71c5fc21cdfc5f7db4d6c 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -5,13 +5,14 @@
 # Translators:
 # Charlie Mak <makchamhim72@gmail.com>, 2013
 # modokwang <modokwang@gmail.com>, 2013
+# Xuetian Weng <wengxt@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-28 06:22-0400\n"
+"PO-Revision-Date: 2013-08-27 19:10+0000\n"
+"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -109,7 +110,7 @@ msgstr ""
 
 #: installer.php:123
 msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "应用未提供 info.xml 文件"
 
 #: installer.php:129
 msgid "App can't be installed because of not allowed code in the App"
@@ -278,7 +279,7 @@ msgstr[0] "%n 分钟前"
 #: template/functions.php:82
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
+msgstr[0] "%n 小时前"
 
 #: template/functions.php:83
 msgid "today"
@@ -291,7 +292,7 @@ msgstr "昨天"
 #: template/functions.php:85
 msgid "%n day go"
 msgid_plural "%n days ago"
-msgstr[0] ""
+msgstr[0] "%n 天前"
 
 #: template/functions.php:86
 msgid "last month"
@@ -300,7 +301,7 @@ msgstr "上月"
 #: template/functions.php:87
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
+msgstr[0] "%n 月前"
 
 #: template/functions.php:88
 msgid "last year"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 7258511fab354d6a477d8afe1c2ec9285dd861df..d8d9cefc362200d99cf2893a1a7566f3dfa0fcf0 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -6,14 +6,15 @@
 # m13253 <m13253@hotmail.com>, 2013
 # waterone <suiy02@gmail.com>, 2013
 # modokwang <modokwang@gmail.com>, 2013
+# Xuetian Weng <wengxt@gmail.com>, 2013
 # zhangmin <zm1990s@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-28 06:22-0400\n"
+"PO-Revision-Date: 2013-08-27 17:40+0000\n"
+"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -106,11 +107,11 @@ msgstr "请稍等...."
 
 #: js/apps.js:71 js/apps.js:72 js/apps.js:92
 msgid "Error while disabling app"
-msgstr ""
+msgstr "禁用 app 时出错"
 
 #: js/apps.js:91 js/apps.js:104 js/apps.js:105
 msgid "Error while enabling app"
-msgstr ""
+msgstr "启用 app 时出错"
 
 #: js/apps.js:115
 msgid "Updating...."
@@ -134,7 +135,7 @@ msgstr "已更新"
 
 #: js/personal.js:150
 msgid "Decrypting files... Please wait, this can take some time."
-msgstr ""
+msgstr "正在解密文件... 请稍等，可能需要一些时间。"
 
 #: js/personal.js:172
 msgid "Saving..."
@@ -483,15 +484,15 @@ msgstr "加密"
 
 #: templates/personal.php:119
 msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr ""
+msgstr "加密 app 未启用，将解密您所有文件"
 
 #: templates/personal.php:125
 msgid "Log-in password"
-msgstr ""
+msgstr "登录密码"
 
 #: templates/personal.php:130
 msgid "Decrypt all Files"
-msgstr ""
+msgstr "解密所有文件"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/zh_CN/user_webdavauth.po b/l10n/zh_CN/user_webdavauth.po
index c3a8727e4b6eeec499f850ccf695f574637536f2..754dd58d6e514f51f9b1ba57cf17ba9d5bd00a28 100644
--- a/l10n/zh_CN/user_webdavauth.po
+++ b/l10n/zh_CN/user_webdavauth.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-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-08-28 06:22-0400\n"
+"PO-Revision-Date: 2013-08-27 19:10+0000\n"
+"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,11 +28,11 @@ msgstr "WebDAV 认证"
 
 #: templates/settings.php:4
 msgid "Address: "
-msgstr ""
+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 ""
+msgstr "用户的身份将会被发送到此 URL。这个插件检查返回值并且将 HTTP 状态编码 401 和 403 解释为非法身份，其他所有返回值为合法身份。"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index f91ec7caff1842c01d9d5fd26531c300e49d9779..13d575a3d0ccd24c52192956c32906d9885cd1be 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -189,23 +218,23 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "Yes"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "OK"
 
@@ -438,7 +467,7 @@ msgstr "個人"
 msgid "Users"
 msgstr "用戶"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "軟件"
 
@@ -571,10 +600,6 @@ msgstr ""
 msgid "Log out"
 msgstr "登出"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "自動登入被拒"
@@ -589,19 +614,19 @@ msgstr "如果你近期未曾更改密碼, 你的帳號可能被洩露!"
 msgid "Please change your password to secure your account again."
 msgstr "請更改你的密碼以保護你的帳戶"
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "忘記密碼"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "記住"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "登入"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index ad3332276dd1ce0e893df9275789d4086fab0478..32b94a8ffc990ecdf6007b48f6adf1391d729fd5 100644
--- a/l10n/zh_HK/files.po
+++ b/l10n/zh_HK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -74,7 +74,11 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "錯誤"
 
@@ -124,40 +127,54 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -195,32 +212,18 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "名稱"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -324,22 +327,6 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 487c676ed0451376314c9c854a3a8e4a088244ad..52d6f701174ee1b5bbe1fe767d01627f95d8d3c9 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -24,6 +24,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s 與您分享了 %s"
 
+#: ajax/share.php:227
+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 ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "未提供分類類型。"
@@ -150,12 +179,12 @@ msgstr "幾秒前"
 #: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
+msgstr[0] "%n 分鐘前"
 
 #: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
+msgstr[0] "%n 小時前"
 
 #: js/js.js:815
 msgid "today"
@@ -168,7 +197,7 @@ msgstr "昨天"
 #: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
-msgstr[0] ""
+msgstr[0] "%n 天前"
 
 #: js/js.js:818
 msgid "last month"
@@ -177,7 +206,7 @@ msgstr "上個月"
 #: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
+msgstr[0] "%n 個月前"
 
 #: js/js.js:820
 msgid "months ago"
@@ -191,23 +220,23 @@ msgstr "去年"
 msgid "years ago"
 msgstr "幾年前"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "選擇"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr "載入檔案選擇器樣板發生錯誤"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "是"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "否"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "好"
 
@@ -374,7 +403,7 @@ msgstr "升級成功，正將您重新導向至 ownCloud 。"
 #: lostpassword/controller.php:61
 #, php-format
 msgid "%s password reset"
-msgstr ""
+msgstr "%s 密碼重設"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -440,7 +469,7 @@ msgstr "個人"
 msgid "Users"
 msgstr "使用者"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "應用程式"
 
@@ -573,10 +602,6 @@ msgstr "%s 已經釋出，瞭解更多資訊以進行更新。"
 msgid "Log out"
 msgstr "登出"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "自動登入被拒！"
@@ -591,19 +616,19 @@ msgstr "如果您最近並未更改密碼，您的帳號可能已經遭到入侵
 msgid "Please change your password to secure your account again."
 msgstr "請更改您的密碼以再次取得您帳戶的控制權。"
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "忘記密碼？"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "記住"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "登入"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "替代登入方法"
 
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 6bca4b0ddc806fb3a55c9041a069fa6031b7e25e..ffc68f12388e577c205715e4e9a2db8b72d045ef 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -75,7 +75,11 @@ msgstr "寫入硬碟失敗"
 msgid "Not enough storage available"
 msgstr "儲存空間不足"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "無效的資料夾。"
 
@@ -95,21 +99,20 @@ msgstr "沒有足夠的可用空間"
 msgid "Upload cancelled."
 msgstr "上傳已取消"
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "檔案上傳中。離開此頁面將會取消上傳。"
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "URL 不能為空白。"
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留"
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "錯誤"
 
@@ -125,40 +128,54 @@ msgstr "永久刪除"
 msgid "Rename"
 msgstr "重新命名"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "等候中"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} 已經存在"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "取代"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "建議檔名"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "使用 {new_name} 取代 {old_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "復原"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n 個資料夾"
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n 個檔案"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
-msgstr[0] ""
+msgstr[0] "%n 個檔案正在上傳"
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "檔案正在上傳中"
 
@@ -188,7 +205,7 @@ msgstr "您的儲存空間快要滿了 ({usedSpacePercent}%)"
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
-msgstr ""
+msgstr "加密已經被停用，但是您的舊檔案還是處於已加密的狀態，請前往個人設定以解密這些檔案。"
 
 #: js/files.js:245
 msgid ""
@@ -196,32 +213,18 @@ msgid ""
 "big."
 msgstr "正在準備您的下載，若您的檔案較大，將會需要更多時間。"
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留"
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "名稱"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "修改"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -325,22 +328,6 @@ msgstr "正在掃描檔案，請稍等。"
 msgid "Current scanning"
 msgstr "目前掃描"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "目錄"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "目錄"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "檔案"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "檔案"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "正在升級檔案系統快取..."
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index 6cf49409e592fb6c9ff1441dc2c0ef61d50883dc..37faace2e6e476b9327b87a6369f0cf99f02e15f 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-26 04:20+0000\n"
+"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "請檢查您的密碼並再試一次。"
 
 #: templates/authenticate.php:7
 msgid "Password"
@@ -32,27 +32,27 @@ msgstr "送出"
 
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "抱歉，這連結看來已經不能用了。"
 
 #: templates/part.404.php:4
 msgid "Reasons might be:"
-msgstr ""
+msgstr "可能的原因："
 
 #: templates/part.404.php:6
 msgid "the item was removed"
-msgstr ""
+msgstr "項目已經移除"
 
 #: templates/part.404.php:7
 msgid "the link expired"
-msgstr ""
+msgstr "連結過期"
 
 #: templates/part.404.php:8
 msgid "sharing is disabled"
-msgstr ""
+msgstr "分享功能已停用"
 
 #: templates/part.404.php:10
 msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "請詢問告訴您此連結的人以瞭解更多"
 
 #: templates/public.php:15
 #, php-format
diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po
index f51e340bf8609dc6d4db151c910c28f569b6d334..53c5a7baec14cf702338c0814e9454aff560a294 100644
--- a/l10n/zh_TW/files_trashbin.po
+++ b/l10n/zh_TW/files_trashbin.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# pellaeon <nfsmwlin@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-26 04:00+0000\n"
+"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,11 +26,11 @@ msgstr "無法永久刪除 %s"
 #: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
-msgstr "無法復原 %s"
+msgstr "無法還原 %s"
 
 #: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
-msgstr "進行復原動作"
+msgstr "進行還原動作"
 
 #: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
@@ -54,16 +55,16 @@ msgstr "已刪除"
 #: js/trash.js:191
 msgid "%n folder"
 msgid_plural "%n folders"
-msgstr[0] ""
+msgstr[0] "%n 個資料夾"
 
 #: js/trash.js:197
 msgid "%n file"
 msgid_plural "%n files"
-msgstr[0] ""
+msgstr[0] "%n 個檔案"
 
 #: lib/trash.php:819 lib/trash.php:821
 msgid "restored"
-msgstr ""
+msgstr "已還原"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
@@ -71,7 +72,7 @@ msgstr "您的垃圾桶是空的！"
 
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
-msgstr "復原"
+msgstr "還原"
 
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
diff --git a/l10n/zh_TW/files_versions.po b/l10n/zh_TW/files_versions.po
index bd093d7fda8962bdae5e87e5b8c4ba1ddf1ea187..cdab9cce2aa6e14c7ebaa55b1a07bbc88ad9514f 100644
--- a/l10n/zh_TW/files_versions.po
+++ b/l10n/zh_TW/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-28 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 06:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-26 04:20+0000\n"
+"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,16 +29,16 @@ msgstr "版本"
 
 #: js/versions.js:53
 msgid "Failed to revert {file} to revision {timestamp}."
-msgstr ""
+msgstr "無法還原檔案 {file} 至版本 {timestamp}"
 
 #: js/versions.js:79
 msgid "More versions..."
-msgstr ""
+msgstr "更多版本…"
 
 #: js/versions.js:116
 msgid "No other versions available"
-msgstr ""
+msgstr "沒有其他版本了"
 
-#: js/versions.js:149
+#: js/versions.js:145
 msgid "Restore"
 msgstr "復原"
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index 3eef00c98ba71c729b1231dd440055c7165f9d79..9f1a0e4503917db4c0bba5b568825182417853f0 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-26 04:10+0000\n"
+"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,11 +23,11 @@ msgstr ""
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "無法安裝應用程式 %s 因為它和此版本的 ownCloud 不相容。"
 
 #: app.php:250
 msgid "No app name specified"
-msgstr ""
+msgstr "沒有指定應用程式名稱"
 
 #: app.php:361
 msgid "Help"
@@ -52,7 +52,7 @@ msgstr "管理"
 #: app.php:837
 #, php-format
 msgid "Failed to upgrade \"%s\"."
-msgstr ""
+msgstr "升級失敗：%s"
 
 #: defaults.php:35
 msgid "web services under your control"
@@ -61,7 +61,7 @@ msgstr "由您控制的網路服務"
 #: files.php:66 files.php:98
 #, php-format
 msgid "cannot open \"%s\""
-msgstr ""
+msgstr "無法開啓 %s"
 
 #: files.php:226
 msgid "ZIP download is turned off."
@@ -83,63 +83,63 @@ msgstr "選擇的檔案太大以致於無法產生壓縮檔。"
 msgid ""
 "Download the files in smaller chunks, seperately or kindly ask your "
 "administrator."
-msgstr ""
+msgstr "以小分割下載您的檔案，請詢問您的系統管理員。"
 
 #: installer.php:63
 msgid "No source specified when installing app"
-msgstr ""
+msgstr "沒有指定應用程式安裝來源"
 
 #: installer.php:70
 msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "從 http 安裝應用程式，找不到 href 屬性"
 
 #: installer.php:75
 msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "從本地檔案安裝應用程式時沒有指定路徑"
 
 #: installer.php:89
 #, php-format
 msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "不支援 %s 格式的壓縮檔"
 
 #: installer.php:103
 msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "安裝應用程式時無法開啓壓縮檔"
 
 #: installer.php:123
 msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "應用程式沒有提供 info.xml 檔案"
 
 #: installer.php:129
 msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "無法安裝應用程式因為在當中找到危險的代碼"
 
 #: installer.php:138
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
-msgstr ""
+msgstr "無法安裝應用程式因為它和此版本的 ownCloud 不相容。"
 
 #: installer.php:144
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
-msgstr ""
+msgstr "無法安裝應用程式，因為它包含了 <shipped>true</shipped> 標籤，在未發行的應用程式當中這是不允許的"
 
 #: installer.php:150
 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 ""
+msgstr "無法安裝應用程式，因為它在 info.xml/version 宣告的版本與 app store 當中記載的版本不同"
 
 #: installer.php:160
 msgid "App directory already exists"
-msgstr ""
+msgstr "應用程式目錄已經存在"
 
 #: installer.php:173
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "無法建立應用程式目錄，請檢查權限：%s"
 
 #: json.php:28
 msgid "Application is not enabled"
@@ -272,12 +272,12 @@ msgstr "幾秒前"
 #: template/functions.php:81
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
+msgstr[0] "%n 分鐘前"
 
 #: template/functions.php:82
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
+msgstr[0] "%n 小時前"
 
 #: template/functions.php:83
 msgid "today"
@@ -290,7 +290,7 @@ msgstr "昨天"
 #: template/functions.php:85
 msgid "%n day go"
 msgid_plural "%n days ago"
-msgstr[0] ""
+msgstr[0] "%n 天前"
 
 #: template/functions.php:86
 msgid "last month"
@@ -299,7 +299,7 @@ msgstr "上個月"
 #: template/functions.php:87
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
+msgstr[0] "%n 個月前"
 
 #: template/functions.php:88
 msgid "last year"
@@ -311,7 +311,7 @@ msgstr "幾年前"
 
 #: template.php:297
 msgid "Caused by:"
-msgstr ""
+msgstr "原因："
 
 #: vcategories.php:188 vcategories.php:249
 #, php-format
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index aaf71f9d66fef95541102e155bc36c940a192416..9ba8be581baebf87bef7d3e65ecee91042f42104 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-26 04:10+0000\n"
+"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -103,11 +103,11 @@ msgstr "請稍候..."
 
 #: js/apps.js:71 js/apps.js:72 js/apps.js:92
 msgid "Error while disabling app"
-msgstr ""
+msgstr "停用應用程式錯誤"
 
 #: js/apps.js:91 js/apps.js:104 js/apps.js:105
 msgid "Error while enabling app"
-msgstr ""
+msgstr "啓用應用程式錯誤"
 
 #: js/apps.js:115
 msgid "Updating...."
@@ -131,7 +131,7 @@ msgstr "已更新"
 
 #: js/personal.js:150
 msgid "Decrypting files... Please wait, this can take some time."
-msgstr ""
+msgstr "檔案解密中，請稍候。"
 
 #: js/personal.js:172
 msgid "Saving..."
@@ -480,15 +480,15 @@ msgstr "加密"
 
 #: templates/personal.php:119
 msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr ""
+msgstr "加密應用程式已經停用，請您解密您所有的檔案"
 
 #: templates/personal.php:125
 msgid "Log-in password"
-msgstr ""
+msgstr "登入密碼"
 
 #: templates/personal.php:130
 msgid "Decrypt all Files"
-msgstr ""
+msgstr "解密所有檔案"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index c8e59df49f4c8cecc369ab9e0ed8b24027f8458f..fd00e191fde285bf38477f3357baed051acb1b66 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # chenanyeh <chnjsn1221@gmail.com>, 2013
+# pellaeon <nfsmwlin@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-26 06:10+0000\n"
+"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,13 +35,13 @@ msgstr "設定有效且連線可建立"
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr "設定有效但連線無法建立。請檢查伺服器的設定與認證資料。"
+msgstr "設定有效但連線無法建立，請檢查伺服器設定與認證資料。"
 
 #: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr "設定無效。更多細節請參閱ownCloud的記錄檔。"
+msgstr "設定無效，更多細節請參閱 ownCloud 的記錄檔。"
 
 #: js/settings.js:66
 msgid "Deletion failed"
@@ -48,11 +49,11 @@ msgstr "移除失敗"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr "要使用最近一次的伺服器設定嗎?"
+msgstr "要使用最近一次的伺服器設定嗎？"
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr "維持設定嗎?"
+msgstr "維持設定嗎？"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
@@ -80,11 +81,11 @@ msgstr "連線測試失敗"
 
 #: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr "您真的確定要刪除現在的伺服器設定嗎?"
+msgstr "您真的要刪除現在的伺服器設定嗎？"
 
 #: js/settings.js:157
 msgid "Confirm Deletion"
-msgstr "確認已刪除"
+msgstr "確認刪除"
 
 #: templates/settings.php:9
 msgid ""
@@ -97,7 +98,7 @@ msgstr ""
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
-msgstr "<b>警告:</b>沒有安裝 PHP LDAP 模組，後端系統將無法運作。請要求您的系統管理員安裝模組。"
+msgstr "<b>警告：</b>沒有安裝 PHP LDAP 模組，後端系統將無法運作，請要求您的系統管理員安裝模組。"
 
 #: templates/settings.php:16
 msgid "Server configuration"
@@ -114,23 +115,23 @@ msgstr "主機"
 #: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr "若您不需要SSL加密傳輸則可忽略通訊協定。若非如此請從ldaps://開始"
+msgstr "若您不需要 SSL 加密連線則不需輸入通訊協定，反之請輸入 ldaps://"
 
 #: templates/settings.php:40
 msgid "Base DN"
-msgstr ""
+msgstr "Base DN"
 
 #: templates/settings.php:41
 msgid "One Base DN per line"
-msgstr "一行一個Base DN"
+msgstr "一行一個 Base DN"
 
 #: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr "您可以在進階標籤頁裡面指定使用者及群組的Base DN"
+msgstr "您可以在進階標籤頁裡面指定使用者及群組的 Base DN"
 
 #: templates/settings.php:44
 msgid "User DN"
-msgstr ""
+msgstr "User DN"
 
 #: templates/settings.php:46
 msgid ""
@@ -145,11 +146,11 @@ msgstr "密碼"
 
 #: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
-msgstr "匿名連接時請將DN與密碼欄位留白"
+msgstr "匿名連接時請將 DN 與密碼欄位留白"
 
 #: templates/settings.php:51
 msgid "User Login Filter"
-msgstr "使用者登入過濾器"
+msgstr "User Login Filter"
 
 #: templates/settings.php:54
 #, php-format
@@ -160,7 +161,7 @@ msgstr ""
 
 #: templates/settings.php:55
 msgid "User List Filter"
-msgstr "使用者名單篩選器"
+msgstr "User List Filter"
 
 #: templates/settings.php:58
 msgid ""
@@ -170,7 +171,7 @@ msgstr ""
 
 #: templates/settings.php:59
 msgid "Group Filter"
-msgstr "群組篩選器"
+msgstr "Group Filter"
 
 #: templates/settings.php:62
 msgid ""
@@ -184,7 +185,7 @@ msgstr "連線設定"
 
 #: templates/settings.php:68
 msgid "Configuration Active"
-msgstr "設定為主動模式"
+msgstr "設定使用中"
 
 #: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
@@ -192,7 +193,7 @@ msgstr "沒有被勾選時，此設定會被略過。"
 
 #: templates/settings.php:69
 msgid "Port"
-msgstr "連接阜"
+msgstr "連接埠"
 
 #: templates/settings.php:70
 msgid "Backup (Replica) Host"
@@ -202,11 +203,11 @@ msgstr "備用主機"
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
-msgstr "請給定一個可選的備用主機。必須是LDAP/AD中央伺服器的複本。"
+msgstr "可以選擇性設定備用主機，必須是 LDAP/AD 中央伺服器的複本。"
 
 #: templates/settings.php:71
 msgid "Backup (Replica) Port"
-msgstr "備用(複本)連接阜"
+msgstr "備用（複本）連接埠"
 
 #: templates/settings.php:72
 msgid "Disable Main Server"
@@ -218,19 +219,19 @@ msgstr ""
 
 #: templates/settings.php:73
 msgid "Use TLS"
-msgstr "使用TLS"
+msgstr "使用 TLS"
 
 #: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
+msgstr "不要同時與 LDAPS 使用，會有問題。"
 
 #: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
-msgstr "不區分大小寫的LDAP伺服器(Windows)"
+msgstr "不區分大小寫的 LDAP 伺服器 (Windows)"
 
 #: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
-msgstr "關閉 SSL 憑證驗證"
+msgstr "關閉 SSL 憑證檢查"
 
 #: templates/settings.php:75
 #, php-format
@@ -245,15 +246,15 @@ msgstr "快取的存活時間"
 
 #: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
-msgstr "以秒為單位。更變後會清空快取。"
+msgstr "以秒為單位。變更後會清空快取。"
 
 #: templates/settings.php:78
 msgid "Directory Settings"
-msgstr "目錄選項"
+msgstr "目錄設定"
 
 #: templates/settings.php:80
 msgid "User Display Name Field"
-msgstr "使用者名稱欄位"
+msgstr "使用者顯示名稱欄位"
 
 #: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
@@ -261,19 +262,19 @@ msgstr ""
 
 #: templates/settings.php:81
 msgid "Base User Tree"
-msgstr "Base使用者數"
+msgstr "Base User Tree"
 
 #: templates/settings.php:81
 msgid "One User Base DN per line"
-msgstr "一行一個使用者Base DN"
+msgstr "一行一個使用者 Base DN"
 
 #: templates/settings.php:82
 msgid "User Search Attributes"
-msgstr "使用者搜索屬性"
+msgstr "User Search Attributes"
 
 #: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
-msgstr "可選的; 一行一項屬性"
+msgstr "非必要，一行一項屬性"
 
 #: templates/settings.php:83
 msgid "Group Display Name Field"
@@ -285,19 +286,19 @@ msgstr ""
 
 #: templates/settings.php:84
 msgid "Base Group Tree"
-msgstr "Base群組樹"
+msgstr "Base Group Tree"
 
 #: templates/settings.php:84
 msgid "One Group Base DN per line"
-msgstr "一行一個群組Base DN"
+msgstr "一行一個 Group Base DN"
 
 #: templates/settings.php:85
 msgid "Group Search Attributes"
-msgstr "群組搜索屬性"
+msgstr "Group Search Attributes"
 
 #: templates/settings.php:86
 msgid "Group-Member association"
-msgstr "群組成員的關係"
+msgstr "Group-Member association"
 
 #: templates/settings.php:88
 msgid "Special Attributes"
diff --git a/lib/base.php b/lib/base.php
index 65118ec76c8ea873f91daaa72a5239a03f56f37f..5e99838a41c55460b808808163753ea70f6261fc 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -262,20 +262,22 @@ class OC {
 		OC_Util::addScript("compatibility");
 		OC_Util::addScript("jquery.ocdialog");
 		OC_Util::addScript("oc-dialogs");
-		OC_Util::addScript("octemplate");
 		OC_Util::addScript("js");
+		OC_Util::addScript("octemplate");
 		OC_Util::addScript("eventsource");
 		OC_Util::addScript("config");
 		//OC_Util::addScript( "multiselect" );
 		OC_Util::addScript('search', 'result');
 		OC_Util::addScript('router');
+		OC_Util::addScript("oc-requesttoken");
 
 		OC_Util::addStyle("styles");
+		OC_Util::addStyle("apps");
+		OC_Util::addStyle("fixes");
 		OC_Util::addStyle("multiselect");
 		OC_Util::addStyle("jquery-ui-1.10.0.custom");
 		OC_Util::addStyle("jquery-tipsy");
 		OC_Util::addStyle("jquery.ocdialog");
-		OC_Util::addScript("oc-requesttoken");
 	}
 
 	public static function initSession() {
@@ -499,6 +501,7 @@ class OC {
 		self::registerCacheHooks();
 		self::registerFilesystemHooks();
 		self::registerShareHooks();
+		self::registerLogRotate();
 
 		//make sure temporary files are cleaned up
 		register_shutdown_function(array('OC_Helper', 'cleanTmp'));
@@ -560,6 +563,21 @@ class OC {
 		}
 	}
 
+	/**
+	 * register hooks for the cache
+	 */
+	public static function registerLogRotate() {
+		if (OC_Config::getValue('installed', false) && OC_Config::getValue('log_rotate_size', false)) {
+			//don't try to do this before we are properly setup
+			// register cache cleanup jobs
+			try { //if this is executed before the upgrade to the new backgroundjob system is completed it will throw an exception
+				\OCP\BackgroundJob::registerJob('OC\Log\Rotate', OC_Config::getValue("datadirectory", OC::$SERVERROOT.'/data').'/owncloud.log');
+			} catch (Exception $e) {
+
+			}
+		}
+	}
+
 	/**
 	 * register hooks for the filesystem
 	 */
@@ -677,12 +695,15 @@ class OC {
 		$app = $param['app'];
 		$file = $param['file'];
 		$app_path = OC_App::getAppPath($app);
-		$file = $app_path . '/' . $file;
-		unset($app, $app_path);
-		if (file_exists($file)) {
-			require_once $file;
-			return true;
+		if (OC_App::isEnabled($app) && $app_path !== false) {
+			$file = $app_path . '/' . $file;
+			unset($app, $app_path);
+			if (file_exists($file)) {
+				require_once $file;
+				return true;
+			}
 		}
+		header('HTTP/1.0 404 Not Found');
 		return false;
 	}
 
@@ -780,14 +801,15 @@ class OC {
 				self::$session->set('timezone', $_POST['timezone-offset']);
 			}
 
-			self::cleanupLoginTokens($_POST['user']);
+			$userid = OC_User::getUser();
+			self::cleanupLoginTokens($userid);
 			if (!empty($_POST["remember_login"])) {
 				if (defined("DEBUG") && DEBUG) {
 					OC_Log::write('core', 'Setting remember login to cookie', OC_Log::DEBUG);
 				}
 				$token = OC_Util::generate_random_bytes(32);
-				OC_Preferences::setValue($_POST['user'], 'login_token', $token, time());
-				OC_User::setMagicInCookie($_POST["user"], $token);
+				OC_Preferences::setValue($userid, 'login_token', $token, time());
+				OC_User::setMagicInCookie($userid, $token);
 			} else {
 				OC_User::unsetMagicInCookie();
 			}
@@ -803,11 +825,16 @@ class OC {
 		) {
 			return false;
 		}
-		OC_App::loadApps(array('authentication'));
-		if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
-			//OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG);
-			OC_User::unsetMagicInCookie();
-			$_SERVER['HTTP_REQUESTTOKEN'] = OC_Util::callRegister();
+		// don't redo authentication if user is already logged in
+		// otherwise session would be invalidated in OC_User::login with 
+		// session_regenerate_id at every page load
+		if (!OC_User::isLoggedIn()) {
+			OC_App::loadApps(array('authentication'));
+			if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
+				//OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG);
+				OC_User::unsetMagicInCookie();
+				$_SERVER['HTTP_REQUESTTOKEN'] = OC_Util::callRegister();
+			}
 		}
 		return true;
 	}
diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index ed8d085462d552ef5b3b6cf315d4647e808a8dcc..3181a4b310f06515a1504ff14708f16c1c6fcbb2 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -233,10 +233,10 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	 * @return array
 	 */
 	public function getQuotaInfo() {
-		$rootInfo=\OC\Files\Filesystem::getFileInfo('');
+		$storageInfo = OC_Helper::getStorageInfo($this->path);
 		return array(
-			$rootInfo['size'],
-			\OC\Files\Filesystem::free_space()
+			$storageInfo['used'],
+			$storageInfo['free']
 		);
 
 	}
diff --git a/lib/connector/sabre/quotaplugin.php b/lib/connector/sabre/quotaplugin.php
index 34d4b676157404c010ec9564b744e000ada65a1e..ea2cb81d1f7532a79e86b1047a84ce2761f8297e 100644
--- a/lib/connector/sabre/quotaplugin.php
+++ b/lib/connector/sabre/quotaplugin.php
@@ -3,58 +3,95 @@
 /**
  * This plugin check user quota and deny creating files when they exceeds the quota.
  *
- * @copyright Copyright (C) 2012 entreCables S.L. All rights reserved.
  * @author Sergio Cambra
+ * @copyright Copyright (C) 2012 entreCables S.L. All rights reserved.
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */
 class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin {
 
 	/**
-		* Reference to main server object
-		*
-		* @var Sabre_DAV_Server
-		*/
+	 * Reference to main server object
+	 *
+	 * @var Sabre_DAV_Server
+	 */
 	private $server;
 
 	/**
-		* This initializes the plugin.
-		*
-		* This function is called by Sabre_DAV_Server, after
-		* addPlugin is called.
-		*
-		* This method should set up the requires event subscriptions.
-		*
-		* @param Sabre_DAV_Server $server
-		* @return void
-		*/
+	 * is kept public to allow overwrite for unit testing
+	 *
+	 * @var \OC\Files\View
+	 */
+	public $fileView;
+
+	/**
+	 * This initializes the plugin.
+	 *
+	 * This function is called by Sabre_DAV_Server, after
+	 * addPlugin is called.
+	 *
+	 * This method should set up the requires event subscriptions.
+	 *
+	 * @param Sabre_DAV_Server $server
+	 * @return void
+	 */
 	public function initialize(Sabre_DAV_Server $server) {
 
-			$this->server = $server;
-			$this->server->subscribeEvent('beforeWriteContent', array($this, 'checkQuota'), 10);
-			$this->server->subscribeEvent('beforeCreateFile', array($this, 'checkQuota'), 10);
+		$this->server = $server;
 
+		$server->subscribeEvent('beforeWriteContent', array($this, 'checkQuota'), 10);
+		$server->subscribeEvent('beforeCreateFile', array($this, 'checkQuota'), 10);
 	}
 
 	/**
-		* This method is called before any HTTP method and forces users to be authenticated
-		*
-		* @param string $method
-		* @throws Sabre_DAV_Exception
-		* @return bool
-		*/
+	 * This method is called before any HTTP method and validates there is enough free space to store the file
+	 *
+	 * @param string $method
+	 * @throws Sabre_DAV_Exception
+	 * @return bool
+	 */
 	public function checkQuota($uri, $data = null) {
-		$expected = $this->server->httpRequest->getHeader('X-Expected-Entity-Length');
-		$length = $expected ? $expected : $this->server->httpRequest->getHeader('Content-Length');
+		$length = $this->getLength();
 		if ($length) {
 			if (substr($uri, 0, 1)!=='/') {
 				$uri='/'.$uri;
 			}
 			list($parentUri, $newName) = Sabre_DAV_URLUtil::splitPath($uri);
-			$freeSpace = \OC\Files\Filesystem::free_space($parentUri);
+			$freeSpace = $this->getFreeSpace($parentUri);
 			if ($freeSpace !== \OC\Files\SPACE_UNKNOWN && $length > $freeSpace) {
 				throw new Sabre_DAV_Exception_InsufficientStorage();
 			}
 		}
 		return true;
 	}
+
+	public function getLength()
+	{
+		$req = $this->server->httpRequest;
+		$length = $req->getHeader('X-Expected-Entity-Length');
+		if (!$length) {
+			$length = $req->getHeader('Content-Length');
+		}
+
+		$ocLength = $req->getHeader('OC-Total-Length');
+		if ($length && $ocLength) {
+			return max($length, $ocLength);
+		}
+
+		return $length;
+	}
+
+	/**
+	 * @param $parentUri
+	 * @return mixed
+	 */
+	public function getFreeSpace($parentUri)
+	{
+		if (is_null($this->fileView)) {
+			// initialize fileView
+			$this->fileView = \OC\Files\Filesystem::getView();
+		}
+
+		$freeSpace = $this->fileView->free_space($parentUri);
+		return $freeSpace;
+	}
 }
diff --git a/lib/files/view.php b/lib/files/view.php
index bb737f19ef823695f8958492490ca2b50e092ba9..8aee12bf6fe2b157e490a40beb2697383032e6ae 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -249,6 +249,7 @@ class View {
 		$hooks = array('touch');
 
 		if (!$this->file_exists($path)) {
+			$hooks[] = 'create';
 			$hooks[] = 'write';
 		}
 		$result = $this->basicOperation('touch', $path, $hooks, $mtime);
diff --git a/lib/group/group.php b/lib/group/group.php
index a752c4311c1f0ffbdfd97d589dd5c69dc0984c71..bcd2419b309b5964e43ca5353e6da4bb059d2b3b 100644
--- a/lib/group/group.php
+++ b/lib/group/group.php
@@ -62,7 +62,6 @@ class Group {
 			return $this->users;
 		}
 
-		$users = array();
 		$userIds = array();
 		foreach ($this->backends as $backend) {
 			$diff = array_diff(
@@ -74,11 +73,8 @@ class Group {
 			}
 		}
 
-		foreach ($userIds as $userId) {
-			$users[] = $this->userManager->get($userId);
-		}
-		$this->users = $users;
-		return $users;
+		$this->users = $this->getVerifiedUsers($userIds);
+		return $this->users;
 	}
 
 	/**
@@ -113,7 +109,7 @@ class Group {
 			if ($backend->implementsActions(OC_GROUP_BACKEND_ADD_TO_GROUP)) {
 				$backend->addToGroup($user->getUID(), $this->gid);
 				if ($this->users) {
-					$this->users[] = $user;
+					$this->users[$user->getUID()] = $user;
 				}
 				if ($this->emitter) {
 					$this->emitter->emit('\OC\Group', 'postAddUser', array($this, $user));
@@ -172,9 +168,7 @@ class Group {
 			if (!is_null($offset)) {
 				$offset -= count($userIds);
 			}
-			foreach ($userIds as $userId) {
-				$users[$userId] = $this->userManager->get($userId);
-			}
+			$users += $this->getVerifiedUsers($userIds);
 			if (!is_null($limit) and $limit <= 0) {
 				return array_values($users);
 			}
@@ -191,7 +185,6 @@ class Group {
 	 * @return \OC\User\User[]
 	 */
 	public function searchDisplayName($search, $limit = null, $offset = null) {
-		$users = array();
 		foreach ($this->backends as $backend) {
 			if ($backend->implementsActions(OC_GROUP_BACKEND_GET_DISPLAYNAME)) {
 				$userIds = array_keys($backend->displayNamesInGroup($this->gid, $search, $limit, $offset));
@@ -204,9 +197,7 @@ class Group {
 			if (!is_null($offset)) {
 				$offset -= count($userIds);
 			}
-			foreach ($userIds as $userId) {
-				$users[$userId] = $this->userManager->get($userId);
-			}
+			$users = $this->getVerifiedUsers($userIds);
 			if (!is_null($limit) and $limit <= 0) {
 				return array_values($users);
 			}
@@ -235,4 +226,23 @@ class Group {
 		}
 		return $result;
 	}
+
+	/**
+	 * @brief returns all the Users from an array that really exists
+	 * @param $userIds an array containing user IDs
+	 * @return an Array with the userId as Key and \OC\User\User as value
+	 */
+	private function getVerifiedUsers($userIds) {
+		if(!is_array($userIds)) {
+			return array();
+		}
+		$users = array();
+		foreach ($userIds as $userId) {
+			$user = $this->userManager->get($userId);
+			if(!is_null($user)) {
+				$users[$userId] = $user;
+			}
+		}
+		return $users;
+	}
 }
diff --git a/lib/helper.php b/lib/helper.php
index c7687d431e1d937208600c1f6d732105f8600605..cfb29028ee3e68ef78db2a5276a7260c939f1bd5 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -841,24 +841,25 @@ class OC_Helper {
 	}
 
 	/**
-	 * Calculate the disc space
+	 * Calculate the disc space for the given path
+	 *
+	 * @param string $path
+	 * @return array
 	 */
-	public static function getStorageInfo() {
-		$rootInfo = \OC\Files\Filesystem::getFileInfo('/');
+	public static function getStorageInfo($path) {
+		$rootInfo = \OC\Files\Filesystem::getFileInfo($path);
 		$used = $rootInfo['size'];
 		if ($used < 0) {
 			$used = 0;
 		}
-		$free = \OC\Files\Filesystem::free_space();
+		$free = \OC\Files\Filesystem::free_space($path);
 		if ($free >= 0) {
 			$total = $free + $used;
 		} else {
 			$total = $free; //either unknown or unlimited
 		}
-		if ($total == 0) {
-			$total = 1; // prevent division by zero
-		}
-		if ($total >= 0) {
+		if ($total > 0) {
+			// prevent division by zero or error codes (negative values)
 			$relative = round(($used / $total) * 10000) / 100;
 		} else {
 			$relative = 0;
diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php
index 83e70585e3699b629439a71da317292b7043d790..166455e652c8c3a16d6f0d1c018e10c3037fc644 100644
--- a/lib/l10n/ca.php
+++ b/lib/l10n/ca.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "L'aplicació \"%s\" no es pot instal·lar perquè no és compatible amb aquesta versió d'ownCloud.",
+"No app name specified" => "No heu especificat cap nom d'aplicació",
 "Help" => "Ajuda",
 "Personal" => "Personal",
 "Settings" => "Configuració",
@@ -13,6 +15,18 @@ $TRANSLATIONS = array(
 "Back to Files" => "Torna a Fitxers",
 "Selected files too large to generate zip file." => "Els fitxers seleccionats son massa grans per generar un fitxer zip.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Baixeu els fitxers en trossos petits, de forma separada, o pregunteu a l'administrador.",
+"No source specified when installing app" => "No heu especificat la font en instal·lar l'aplicació",
+"No href specified when installing app from http" => "No heu especificat href en instal·lar l'aplicació des de http",
+"No path specified when installing app from local file" => "No heu seleccionat el camí en instal·lar una aplicació des d'un fitxer local",
+"Archives of type %s are not supported" => "Els fitxers del tipus %s no són compatibles",
+"Failed to open archive when installing app" => "Ha fallat l'obertura del fitxer en instal·lar l'aplicació",
+"App does not provide an info.xml file" => "L'aplicació no proporciona un fitxer info.xml",
+"App can't be installed because of not allowed code in the App" => "L'aplicació no es pot instal·lar perquè hi ha codi no autoritzat en l'aplicació",
+"App can't be installed because it is not compatible with this version of ownCloud" => "L'aplicació no es pot instal·lar perquè no és compatible amb aquesta versió d'ownCloud",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "L'aplicació no es pot instal·lar perquè conté l'etiqueta <shipped>vertader</shipped> que no es permet per aplicacions no enviades",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "L'aplicació no es pot instal·lar perquè la versió a info.xml/version no és la mateixa que la versió indicada des de la botiga d'aplicacions",
+"App directory already exists" => "La carpeta de l'aplicació ja existeix",
+"Can't create app folder. Please fix permissions. %s" => "No es pot crear la carpeta de l'aplicació. Arregleu els permisos. %s",
 "Application is not enabled" => "L'aplicació no està habilitada",
 "Authentication error" => "Error d'autenticació",
 "Token expired. Please reload page." => "El testimoni ha expirat. Torneu a carregar la pàgina.",
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
index 1a80fc78bb63b6e16a1254753c2a546871d7d900..fed9ad03c010dbeda0ee0266ed84ce74fc12fccc 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Aplikace \"%s\" nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud.",
+"No app name specified" => "Nebyl zadan název aplikace",
 "Help" => "Nápověda",
 "Personal" => "Osobní",
 "Settings" => "Nastavení",
@@ -13,6 +15,18 @@ $TRANSLATIONS = array(
 "Back to Files" => "Zpět k souborům",
 "Selected files too large to generate zip file." => "Vybrané soubory jsou příliš velké pro vytvoření ZIP souboru.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Stáhněte soubory po menších částech, samostatně, nebo se obraťte na správce.",
+"No source specified when installing app" => "Nebyl zadán zdroj při instalaci aplikace",
+"No href specified when installing app from http" => "Nebyl zadán odkaz pro instalaci aplikace z HTTP",
+"No path specified when installing app from local file" => "Nebyla zadána cesta pro instalaci aplikace z místního souboru",
+"Archives of type %s are not supported" => "Archivy typu %s nejsou podporovány",
+"Failed to open archive when installing app" => "Chyba při otevírání archivu během instalace aplikace",
+"App does not provide an info.xml file" => "Aplikace neposkytuje soubor info.xml",
+"App can't be installed because of not allowed code in the App" => "Aplikace nemůže být nainstalována, protože obsahuje nepovolený kód",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Aplikace nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Aplikace nemůže být nainstalována, protože obsahuje značku\n<shipped>\n\ntrue\n</shipped>\n\ncož není povoleno pro nedodávané aplikace",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Aplikace nemůže být nainstalována, protože verze uvedená v info.xml/version nesouhlasí s verzí oznámenou z úložiště aplikací.",
+"App directory already exists" => "Adresář aplikace již existuje",
+"Can't create app folder. Please fix permissions. %s" => "Nelze vytvořit složku aplikace. Opravte práva souborů. %s",
 "Application is not enabled" => "Aplikace není povolena",
 "Authentication error" => "Chyba ověření",
 "Token expired. Please reload page." => "Token vypršel. Obnovte prosím stránku.",
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index 78859b087459853c4fa6bae7247d63ed43a58e9f..2690314276307164d9b50c1a49e8a49eeb6a54ca 100644
--- a/lib/l10n/da.php
+++ b/lib/l10n/da.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "App'en \"%s\" kan ikke blive installeret, da den ikke er kompatibel med denne version af ownCloud.",
+"No app name specified" => "Intet app-navn angivet",
 "Help" => "Hjælp",
 "Personal" => "Personligt",
 "Settings" => "Indstillinger",
@@ -13,6 +15,18 @@ $TRANSLATIONS = array(
 "Back to Files" => "Tilbage til Filer",
 "Selected files too large to generate zip file." => "De markerede filer er for store til at generere en ZIP-fil.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Download filerne i små bider, seperat, eller kontakt venligst din administrator.",
+"No source specified when installing app" => "Ingen kilde angivet under installation af app",
+"No href specified when installing app from http" => "Ingen href angivet under installation af app via http",
+"No path specified when installing app from local file" => "Ingen sti angivet under installation af app fra lokal fil",
+"Archives of type %s are not supported" => "Arkiver af type %s understøttes ikke",
+"Failed to open archive when installing app" => "Kunne ikke åbne arkiv under installation af appen",
+"App does not provide an info.xml file" => "Der følger ingen info.xml-fil med appen",
+"App can't be installed because of not allowed code in the App" => "Appen kan ikke installeres, da den indeholder ikke-tilladt kode",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Appen kan ikke installeres, da den ikke er kompatibel med denne version af ownCloud.",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Appen kan ikke installeres, da den indeholder taget\n<shipped>\n\ntrue\n</shipped>\n\nhvilket ikke er tilladt for ikke-medfølgende apps",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "App kan ikke installeres, da versionen i info.xml/version ikke er den samme som versionen rapporteret fra app-storen",
+"App directory already exists" => "App-mappe findes allerede",
+"Can't create app folder. Please fix permissions. %s" => "Kan ikke oprette app-mappe. Ret tilladelser. %s",
 "Application is not enabled" => "Programmet er ikke aktiveret",
 "Authentication error" => "Adgangsfejl",
 "Token expired. Please reload page." => "Adgang er udløbet. Genindlæs siden.",
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index 01fe5ee05839cd01ec251eeda07661b0cde0c519..7a3e2c43e6ba6f060e6e35dc086bff5263bf1292 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Applikation \"%s\" kann nicht installiert werden, da sie mit dieser ownCloud Version nicht kompatibel ist.",
+"No app name specified" => "Es wurde kein Applikation-Name angegeben",
 "Help" => "Hilfe",
 "Personal" => "Persönlich",
 "Settings" => "Einstellungen",
@@ -13,6 +15,18 @@ $TRANSLATIONS = array(
 "Back to Files" => "Zurück zu \"Dateien\"",
 "Selected files too large to generate zip file." => "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Lade die Dateien in kleineren, separaten, Stücken herunter oder bitte deinen Administrator.",
+"No source specified when installing app" => "Für die Installation der Applikation wurde keine Quelle angegeben",
+"No href specified when installing app from http" => "Der Link (href) wurde nicht angegeben um die Applikation per http zu installieren",
+"No path specified when installing app from local file" => "Bei der Installation der Applikation aus einer lokalen Datei wurde kein Pfad angegeben",
+"Archives of type %s are not supported" => "Archive vom Typ %s werden nicht unterstützt",
+"Failed to open archive when installing app" => "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden",
+"App does not provide an info.xml file" => "Die Applikation enthält keine info,xml Datei",
+"App can't be installed because of not allowed code in the App" => "Die Applikation kann auf Grund von unerlaubten Code nicht installiert werden",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist.",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Die Applikation konnte nicht installiert werden, da diese das <shipped>true</shipped> Tag beinhaltet und dieses, bei nicht mitausgelieferten Applikationen, nicht erlaubt ist ist",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist",
+"App directory already exists" => "Das Applikationsverzeichnis existiert bereits",
+"Can't create app folder. Please fix permissions. %s" => "Es kann kein Applikationsordner erstellt werden. Bitte passen sie die  Berechtigungen an. %s",
 "Application is not enabled" => "Die Anwendung ist nicht aktiviert",
 "Authentication error" => "Fehler bei der Anmeldung",
 "Token expired. Please reload page." => "Token abgelaufen. Bitte lade die Seite neu.",
diff --git a/lib/l10n/de_CH.php b/lib/l10n/de_CH.php
index 188ea4e2fc07c2e19e4b337a4eaa8327be83e203..33f3446a693192337a4ed70861f236509ac5c54c 100644
--- a/lib/l10n/de_CH.php
+++ b/lib/l10n/de_CH.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Anwendung \"%s\" kann nicht installiert werden, da sie mit dieser Version von ownCloud nicht kompatibel ist.",
+"No app name specified" => "Kein App-Name spezifiziert",
 "Help" => "Hilfe",
 "Personal" => "Persönlich",
 "Settings" => "Einstellungen",
@@ -13,6 +15,8 @@ $TRANSLATIONS = array(
 "Back to Files" => "Zurück zu \"Dateien\"",
 "Selected files too large to generate zip file." => "Die gewählten Dateien sind zu gross, um eine ZIP-Datei zu erstellen.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Laden Sie die Dateien in kleineren, separaten, Stücken herunter oder bitten Sie Ihren Administrator.",
+"App can't be installed because of not allowed code in the App" => "Anwendung kann wegen nicht erlaubten Codes nicht installiert werden",
+"App directory already exists" => "Anwendungsverzeichnis existiert bereits",
 "Application is not enabled" => "Die Anwendung ist nicht aktiviert",
 "Authentication error" => "Authentifizierungs-Fehler",
 "Token expired. Please reload page." => "Token abgelaufen. Bitte laden Sie die Seite neu.",
@@ -40,13 +44,13 @@ $TRANSLATIONS = array(
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
 "Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
 "seconds ago" => "Gerade eben",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("","Vor %n Minuten"),
+"_%n hour ago_::_%n hours ago_" => array("","Vor %n Stunden"),
 "today" => "Heute",
 "yesterday" => "Gestern",
-"_%n day go_::_%n days ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("","Vor %n Tagen"),
 "last month" => "Letzten Monat",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","Vor %n Monaten"),
 "last year" => "Letztes Jahr",
 "years ago" => "Vor  Jahren",
 "Caused by:" => "Verursacht durch:",
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index 9fd319b7e1b178214e142201c23afeb4bf7bfa3a..0a72f443e4d75a6aa28cb8ac07214b353c55596d 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Applikation \"%s\" kann nicht installiert werden, da sie mit dieser ownCloud Version nicht kompatibel ist.",
+"No app name specified" => "Es wurde kein Applikation-Name angegeben",
 "Help" => "Hilfe",
 "Personal" => "Persönlich",
 "Settings" => "Einstellungen",
@@ -13,6 +15,18 @@ $TRANSLATIONS = array(
 "Back to Files" => "Zurück zu \"Dateien\"",
 "Selected files too large to generate zip file." => "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Laden Sie die Dateien in kleineren, separaten, Stücken herunter oder bitten Sie Ihren Administrator.",
+"No source specified when installing app" => "Für die Installation der Applikation wurde keine Quelle angegeben",
+"No href specified when installing app from http" => "Der Link (href) wurde nicht angegeben um die Applikation per http zu installieren",
+"No path specified when installing app from local file" => "Bei der Installation der Applikation aus einer lokalen Datei wurde kein Pfad angegeben",
+"Archives of type %s are not supported" => "Archive des Typs %s werden nicht unterstützt.",
+"Failed to open archive when installing app" => "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden",
+"App does not provide an info.xml file" => "Die Applikation enthält keine info,xml Datei",
+"App can't be installed because of not allowed code in the App" => "Die Applikation kann auf Grund von unerlaubten Code nicht installiert werden",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist.",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Die Applikation konnte nicht installiert werden, da diese das <shipped>true</shipped> Tag beinhaltet und dieses, bei nicht mitausgelieferten Applikationen, nicht erlaubt ist ist",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist",
+"App directory already exists" => "Der Ordner für die Anwendung existiert bereits.",
+"Can't create app folder. Please fix permissions. %s" => "Der Ordner für die Anwendung konnte nicht angelegt werden. Bitte überprüfen Sie die Ordner- und Dateirechte und passen Sie diese entsprechend an. %s",
 "Application is not enabled" => "Die Anwendung ist nicht aktiviert",
 "Authentication error" => "Authentifizierungs-Fehler",
 "Token expired. Please reload page." => "Token abgelaufen. Bitte laden Sie die Seite neu.",
diff --git a/lib/l10n/en_GB.php b/lib/l10n/en_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..f799c071c76180d856a4033da5c1c901f12a799e
--- /dev/null
+++ b/lib/l10n/en_GB.php
@@ -0,0 +1,69 @@
+<?php
+$TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "App \"%s\" can't be installed because it is not compatible with this version of ownCloud.",
+"No app name specified" => "No app name specified",
+"Help" => "Help",
+"Personal" => "Personal",
+"Settings" => "Settings",
+"Users" => "Users",
+"Admin" => "Admin",
+"Failed to upgrade \"%s\"." => "Failed to upgrade \"%s\".",
+"web services under your control" => "web services under your control",
+"cannot open \"%s\"" => "cannot open \"%s\"",
+"ZIP download is turned off." => "ZIP download is turned off.",
+"Files need to be downloaded one by one." => "Files need to be downloaded one by one.",
+"Back to Files" => "Back to Files",
+"Selected files too large to generate zip file." => "Selected files too large to generate zip file.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Download the files in smaller chunks, seperately or kindly ask your administrator.",
+"No source specified when installing app" => "No source specified when installing app",
+"No href specified when installing app from http" => "No href specified when installing app from http",
+"No path specified when installing app from local file" => "No path specified when installing app from local file",
+"Archives of type %s are not supported" => "Archives of type %s are not supported",
+"Failed to open archive when installing app" => "Failed to open archive when installing app",
+"App does not provide an info.xml file" => "App does not provide an info.xml file",
+"App can't be installed because of not allowed code in the App" => "App can't be installed because of unallowed code in the App",
+"App can't be installed because it is not compatible with this version of ownCloud" => "App can't be installed because it is not compatible with this version of ownCloud",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store",
+"App directory already exists" => "App directory already exists",
+"Can't create app folder. Please fix permissions. %s" => "Can't create app folder. Please fix permissions. %s",
+"Application is not enabled" => "Application is not enabled",
+"Authentication error" => "Authentication error",
+"Token expired. Please reload page." => "Token expired. Please reload page.",
+"Files" => "Files",
+"Text" => "Text",
+"Images" => "Images",
+"%s enter the database username." => "%s enter the database username.",
+"%s enter the database name." => "%s enter the database name.",
+"%s you may not use dots in the database name" => "%s you may not use dots in the database name",
+"MS SQL username and/or password not valid: %s" => "MS SQL username and/or password not valid: %s",
+"You need to enter either an existing account or the administrator." => "You need to enter either an existing account or the administrator.",
+"MySQL username and/or password not valid" => "MySQL username and/or password not valid",
+"DB Error: \"%s\"" => "DB Error: \"%s\"",
+"Offending command was: \"%s\"" => "Offending command was: \"%s\"",
+"MySQL user '%s'@'localhost' exists already." => "MySQL user '%s'@'localhost' exists already.",
+"Drop this user from MySQL" => "Drop this user from MySQL",
+"MySQL user '%s'@'%%' already exists" => "MySQL user '%s'@'%%' already exists",
+"Drop this user from MySQL." => "Drop this user from MySQL.",
+"Oracle connection could not be established" => "Oracle connection could not be established",
+"Oracle username and/or password not valid" => "Oracle username and/or password not valid",
+"Offending command was: \"%s\", name: %s, password: %s" => "Offending command was: \"%s\", name: %s, password: %s",
+"PostgreSQL username and/or password not valid" => "PostgreSQL username and/or password not valid",
+"Set an admin username." => "Set an admin username.",
+"Set an admin password." => "Set an admin password.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken.",
+"Please double check the <a href='%s'>installation guides</a>." => "Please double check the <a href='%s'>installation guides</a>.",
+"seconds ago" => "seconds ago",
+"_%n minute ago_::_%n minutes ago_" => array("","%n minutes ago"),
+"_%n hour ago_::_%n hours ago_" => array("","%n hours ago"),
+"today" => "today",
+"yesterday" => "yesterday",
+"_%n day go_::_%n days ago_" => array("","%n days ago"),
+"last month" => "last month",
+"_%n month ago_::_%n months ago_" => array("","%n months ago"),
+"last year" => "last year",
+"years ago" => "years ago",
+"Caused by:" => "Caused by:",
+"Could not find category \"%s\"" => "Could not find category \"%s\""
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
index a2ac6bcabc9177c944e0d73a0f44998778e9353c..8e3aa55c4ed9ced40f266f8a8bd7627251699385 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Rakendit \"%s\" ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga.",
+"No app name specified" => "Ühegi rakendi nime pole määratletud",
 "Help" => "Abiinfo",
 "Personal" => "Isiklik",
 "Settings" => "Seaded",
@@ -13,6 +15,18 @@ $TRANSLATIONS = array(
 "Back to Files" => "Tagasi failide juurde",
 "Selected files too large to generate zip file." => "Valitud failid on ZIP-faili loomiseks liiga suured.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Laadi failid alla eraldi väiksemate osadena või küsi nõu oma süsteemiadminstraatorilt.",
+"No source specified when installing app" => "Ühegi lähteallikat pole rakendi paigalduseks määratletud",
+"No href specified when installing app from http" => "Ühtegi aadressi pole määratletud rakendi paigalduseks veebist",
+"No path specified when installing app from local file" => "Ühtegi teed pole määratletud paigaldamaks rakendit kohalikust failist",
+"Archives of type %s are not supported" => "%s tüüpi arhiivid pole toetatud",
+"Failed to open archive when installing app" => "Arhiivi avamine ebaõnnestus rakendi paigalduse käigus",
+"App does not provide an info.xml file" => "Rakend ei paku ühtegi info.xml faili",
+"App can't be installed because of not allowed code in the App" => "Rakendit ei saa paigaldada, kuna sisaldab lubamatud koodi",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Rakendit ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga.",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Rakendit ei saa paigaldada, kuna see sisaldab \n<shipped>\n\ntrue\n</shipped>\nmärgendit, mis pole lubatud mitte veetud (non shipped) rakendites",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Rakendit ei saa paigaldada, kuna selle versioon info.xml/version pole sama, mis on märgitud rakendite laos.",
+"App directory already exists" => "Rakendi kataloog on juba olemas",
+"Can't create app folder. Please fix permissions. %s" => "Ei saa luua rakendi kataloogi. Palun korrigeeri õigusi. %s",
 "Application is not enabled" => "Rakendus pole sisse lülitatud",
 "Authentication error" => "Autentimise viga",
 "Token expired. Please reload page." => "Kontrollkood aegus. Paelun lae leht uuesti.",
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index 4552d4627c0bdb3faf6c7f9645a77b659013567e..2e69df43ad2e20a321272f6b9f9e23fa9fe380da 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Sovellusta \"%s\" ei voi asentaa, koska se ei ole yhteensopiva käytössä olevan ownCloud-version kanssa.",
 "Help" => "Ohje",
 "Personal" => "Henkilökohtainen",
 "Settings" => "Asetukset",
@@ -10,6 +11,12 @@ $TRANSLATIONS = array(
 "Files need to be downloaded one by one." => "Tiedostot on ladattava yksittäin.",
 "Back to Files" => "Takaisin tiedostoihin",
 "Selected files too large to generate zip file." => "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon.",
+"No source specified when installing app" => "Lähdettä ei määritelty sovellusta asennettaessa",
+"No path specified when installing app from local file" => "Polkua ei määritelty sovellusta asennettaessa paikallisesta tiedostosta",
+"Archives of type %s are not supported" => "Tyypin %s arkistot eivät ole tuettuja",
+"App does not provide an info.xml file" => "Sovellus ei sisällä info.xml-tiedostoa",
+"App directory already exists" => "Sovelluskansio on jo olemassa",
+"Can't create app folder. Please fix permissions. %s" => "Sovelluskansion luominen ei onnistu. Korjaa käyttöoikeudet. %s",
 "Application is not enabled" => "Sovellusta ei ole otettu käyttöön",
 "Authentication error" => "Tunnistautumisvirhe",
 "Token expired. Please reload page." => "Valtuutus vanheni. Lataa sivu uudelleen.",
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index 4d92e89ebbaffe0204468a09571bbca0b15b7671..a8fee3b1bc1f090ecabe2d78739b5327cbbc889e 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Non é posíbel instalar o aplicativo «%s» por non seren compatíbel  con esta versión do ownCloud.",
+"No app name specified" => "Non se especificou o nome do aplicativo",
 "Help" => "Axuda",
 "Personal" => "Persoal",
 "Settings" => "Axustes",
@@ -13,6 +15,18 @@ $TRANSLATIONS = array(
 "Back to Files" => "Volver aos ficheiros",
 "Selected files too large to generate zip file." => "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descargue os ficheiros en cachos máis pequenos e por separado, ou pídallos amabelmente ao seu administrador.",
+"No source specified when installing app" => "Non foi especificada ningunha orixe ao instalar aplicativos",
+"No href specified when installing app from http" => "Non foi especificada ningunha href ao instalar aplicativos",
+"No path specified when installing app from local file" => "Non foi especificada ningunha ruta ao instalar aplicativos desde un ficheiro local",
+"Archives of type %s are not supported" => "Os arquivos do tipo %s non están admitidos",
+"Failed to open archive when installing app" => "Non foi posíbel abrir o arquivo ao instalar aplicativos",
+"App does not provide an info.xml file" => "O aplicativo non fornece un ficheiro info.xml",
+"App can't be installed because of not allowed code in the App" => "Non é posíbel instalar o aplicativo por mor de conter código non permitido",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Non é posíbel instalar o aplicativo por non seren compatíbel  con esta versión do ownCloud.",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Non é posíbel instalar o aplicativo por conter a etiqueta\n<shipped>\n\ntrue\n</shipped>\nque non está permitida para os aplicativos non enviados",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Non é posíbel instalar o aplicativo xa que a versión en info.xml/version non é a mesma que a versión informada desde a App Store",
+"App directory already exists" => "Xa existe o directorio do aplicativo",
+"Can't create app folder. Please fix permissions. %s" => "Non é posíbel crear o cartafol de aplicativos. Corrixa os permisos. %s",
 "Application is not enabled" => "O aplicativo non está activado",
 "Authentication error" => "Produciuse un erro de autenticación",
 "Token expired. Please reload page." => "Testemuña caducada. Recargue a páxina.",
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index 983152a14ca4524772246fadf00353ddf5a7cc37..a35027eb96251676a6d579a18a20a0e93115e8cb 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "L'applicazione \"%s\" non può essere installata poiché non è compatibile con questa versione di ownCloud.",
+"No app name specified" => "Il nome dell'applicazione non è specificato",
 "Help" => "Aiuto",
 "Personal" => "Personale",
 "Settings" => "Impostazioni",
@@ -13,6 +15,17 @@ $TRANSLATIONS = array(
 "Back to Files" => "Torna ai file",
 "Selected files too large to generate zip file." => "I  file selezionati sono troppo grandi per generare un file zip.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Scarica i file in blocchi più piccoli, separatamente o chiedi al tuo amministratore.",
+"No source specified when installing app" => "Nessuna fonte specificata durante l'installazione dell'applicazione",
+"No href specified when installing app from http" => "Nessun href specificato durante l'installazione dell'applicazione da http",
+"No path specified when installing app from local file" => "Nessun percorso specificato durante l'installazione dell'applicazione da file locale",
+"Archives of type %s are not supported" => "Gli archivi di tipo %s non sono supportati",
+"Failed to open archive when installing app" => "Apertura archivio non riuscita durante l'installazione dell'applicazione",
+"App does not provide an info.xml file" => "L'applicazione non fornisce un file info.xml",
+"App can't be installed because of not allowed code in the App" => "L'applicazione non può essere installata a causa di codice non consentito al suo interno",
+"App can't be installed because it is not compatible with this version of ownCloud" => "L'applicazione non può essere installata poiché non è compatibile con questa versione di ownCloud",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "L'applicazione non può essere installata poiché la versione in info.xml/version non è la stessa riportata dall'app store",
+"App directory already exists" => "La cartella dell'applicazione esiste già",
+"Can't create app folder. Please fix permissions. %s" => "Impossibile creare la cartella dell'applicazione. Correggi i permessi. %s",
 "Application is not enabled" => "L'applicazione  non è abilitata",
 "Authentication error" => "Errore di autenticazione",
 "Token expired. Please reload page." => "Token scaduto. Ricarica la pagina.",
diff --git a/lib/l10n/ko.php b/lib/l10n/ko.php
index 4dab8b816bf0b2fead2fcebf01f7dec601e79101..eec5be65abd5d4a48974f3688a99c4781587aea1 100644
--- a/lib/l10n/ko.php
+++ b/lib/l10n/ko.php
@@ -1,15 +1,31 @@
 <?php
 $TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "현재 ownCloud 버전과 호환되지 않기 때문에 \"%s\" 앱을 설치할 수 없습니다.",
+"No app name specified" => "앱 이름이 지정되지 않았습니다.",
 "Help" => "도움말",
 "Personal" => "개인",
 "Settings" => "설정",
 "Users" => "사용자",
 "Admin" => "관리자",
+"Failed to upgrade \"%s\"." => "\"%s\" 업그레이드에 실패했습니다.",
 "web services under your control" => "내가 관리하는 웹 서비스",
+"cannot open \"%s\"" => "\"%s\"을(를) 열 수 없습니다.",
 "ZIP download is turned off." => "ZIP 다운로드가 비활성화되었습니다.",
 "Files need to be downloaded one by one." => "파일을 개별적으로 다운로드해야 합니다.",
 "Back to Files" => "파일로 돌아가기",
 "Selected files too large to generate zip file." => "선택한 파일들은 ZIP 파일을 생성하기에 너무 큽니다.",
+"No source specified when installing app" => "앱을 설치할 때 소스가 지정되지 않았습니다.",
+"No href specified when installing app from http" => "http에서 앱을 설치할 대 href가 지정되지 않았습니다.",
+"No path specified when installing app from local file" => "로컬 파일에서 앱을 설치할 때 경로가 지정되지 않았습니다.",
+"Archives of type %s are not supported" => "%s 타입 아카이브는 지원되지 않습니다.",
+"Failed to open archive when installing app" => "앱을 설치할 때 아카이브를 열지 못했습니다.",
+"App does not provide an info.xml file" => "앱에서 info.xml 파일이 제공되지 않았습니다.",
+"App can't be installed because of not allowed code in the App" => "앱에 허용되지 않는 코드가 있어서 앱을 설치할 수 없습니다. ",
+"App can't be installed because it is not compatible with this version of ownCloud" => "현재 ownCloud 버전과 호환되지 않기 때문에 앱을 설치할 수 없습니다.",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "출하되지 않은 앱에 허용되지 않는 <shipped>true</shipped> 태그를 포함하고 있기 때문에 앱을 설치할 수 없습니다.",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "info.xml/version에 포함된 버전과 앱 스토어에 보고된 버전이 같지 않아서 앱을 설치할 수 없습니다. ",
+"App directory already exists" => "앱 디렉토리가 이미 존재합니다. ",
+"Can't create app folder. Please fix permissions. %s" => "앱 폴더를 만들 수 없습니다. 권한을 수정하십시오. %s ",
 "Application is not enabled" => "앱이 활성화되지 않았습니다",
 "Authentication error" => "인증 오류",
 "Token expired. Please reload page." => "토큰이 만료되었습니다. 페이지를 새로 고치십시오.",
@@ -19,22 +35,34 @@ $TRANSLATIONS = array(
 "%s enter the database username." => "데이터베이스 사용자 명을 %s 에 입력해주십시오",
 "%s enter the database name." => "데이터베이스 명을 %s 에 입력해주십시오",
 "%s you may not use dots in the database name" => "%s 에 적으신 데이터베이스 이름에는 점을 사용할수 없습니다",
+"MS SQL username and/or password not valid: %s" => "MS SQL 사용자 이름이나 암호가 잘못되었습니다: %s",
+"You need to enter either an existing account or the administrator." => "기존 계정이나 administrator(관리자)를 입력해야 합니다.",
+"MySQL username and/or password not valid" => "MySQL 사용자 이름이나 암호가 잘못되었습니다.",
 "DB Error: \"%s\"" => "DB 오류: \"%s\"",
+"Offending command was: \"%s\"" => "잘못된 명령: \"%s\"",
+"MySQL user '%s'@'localhost' exists already." => "MySQL 사용자 '%s'@'localhost'이(가) 이미 존재합니다.",
+"Drop this user from MySQL" => "이 사용자를 MySQL에서 뺍니다.",
+"MySQL user '%s'@'%%' already exists" => "MySQL 사용자 '%s'@'%%'이(가) 이미 존재합니다. ",
+"Drop this user from MySQL." => "이 사용자를 MySQL에서 뺍니다.",
+"Oracle connection could not be established" => "Oracle 연결을 수립할 수 없습니다.",
+"Oracle username and/or password not valid" => "Oracle 사용자 이름이나 암호가 잘못되었습니다.",
+"Offending command was: \"%s\", name: %s, password: %s" => "잘못된 명령: \"%s\", 이름: %s, 암호: %s",
 "PostgreSQL username and/or password not valid" => "PostgreSQL의 사용자 명 혹은 비밀번호가 잘못되었습니다",
 "Set an admin username." => "관리자 이름 설정",
 "Set an admin password." => "관리자 비밀번호 설정",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서버에서 파일 동기화를 사용할 수 있도록 설정이 제대로 되지 않은 것 같습니다.",
 "Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오.",
 "seconds ago" => "ì´ˆ ì „",
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n minute ago_::_%n minutes ago_" => array("%n분 전 "),
+"_%n hour ago_::_%n hours ago_" => array("%n시간 전 "),
 "today" => "오늘",
 "yesterday" => "어제",
-"_%n day go_::_%n days ago_" => array(""),
+"_%n day go_::_%n days ago_" => array("%n일 전 "),
 "last month" => "지난 달",
-"_%n month ago_::_%n months ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("%n달 전 "),
 "last year" => "ìž‘ë…„",
 "years ago" => "ë…„ ì „",
+"Caused by:" => "원인: ",
 "Could not find category \"%s\"" => "분류 \"%s\"을(를) 찾을 수 없습니다."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/lt_LT.php b/lib/l10n/lt_LT.php
index fb109b86339be00a87c5865ffbc5dcb6aea431e2..242b0a231063dfea2d15763918900aad3dbb8075 100644
--- a/lib/l10n/lt_LT.php
+++ b/lib/l10n/lt_LT.php
@@ -17,13 +17,13 @@ $TRANSLATIONS = array(
 "Text" => "Žinučių",
 "Images" => "PaveikslÄ—liai",
 "seconds ago" => "prieš sekundę",
-"_%n minute ago_::_%n minutes ago_" => array("","",""),
-"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n minute ago_::_%n minutes ago_" => array("",""," prieš %n minučių"),
+"_%n hour ago_::_%n hours ago_" => array("","","prieš %n valandų"),
 "today" => "Å¡iandien",
 "yesterday" => "vakar",
 "_%n day go_::_%n days ago_" => array("","",""),
 "last month" => "praeitą mėnesį",
-"_%n month ago_::_%n months ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("","","prieš %n mėnesių"),
 "last year" => "praeitais metais",
 "years ago" => "prieš metus"
 );
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
index 338c3673c5b4a9309b8dc4246dd5b2888be194d0..e546c1f3179c7fc8d1a302b8fc0efefcb66a7a67 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"No app name specified" => "De app naam is niet gespecificeerd.",
 "Help" => "Help",
 "Personal" => "Persoonlijk",
 "Settings" => "Instellingen",
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index 52329667174ecff9ec383856e54c786d8c1515b4..a2379ca4883d76afac2edb367797f87a7ab0fff9 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "O aplicativo \"%s\" não pode ser instalado porque não é compatível com esta versão do ownCloud.",
+"No app name specified" => "O nome do aplicativo não foi especificado.",
 "Help" => "Ajuda",
 "Personal" => "Pessoal",
 "Settings" => "Ajustes",
@@ -13,6 +15,18 @@ $TRANSLATIONS = array(
 "Back to Files" => "Voltar para Arquivos",
 "Selected files too large to generate zip file." => "Arquivos selecionados são muito grandes para gerar arquivo zip.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Baixe os arquivos em pedaços menores, separadamente ou solicite educadamente  ao seu administrador.",
+"No source specified when installing app" => "Nenhuma fonte foi especificada enquanto instalava o aplicativo",
+"No href specified when installing app from http" => "Nenhuma href foi especificada enquanto instalava o aplicativo de httml",
+"No path specified when installing app from local file" => "Nenhum caminho foi especificado enquanto instalava o aplicativo do arquivo local",
+"Archives of type %s are not supported" => "Arquivos do tipo %s não são suportados",
+"Failed to open archive when installing app" => "Falha para abrir o arquivo enquanto instalava o aplicativo",
+"App does not provide an info.xml file" => "O aplicativo não fornece um arquivo info.xml",
+"App can't be installed because of not allowed code in the App" => "O aplicativo não pode ser instalado por causa do código não permitido no Aplivativo",
+"App can't be installed because it is not compatible with this version of ownCloud" => "O aplicativo não pode ser instalado porque não é compatível com esta versão do ownCloud",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "O aplicativo não pode ser instalado porque ele contém a marca <shipped>verdadeiro</shipped> que não é permitido para aplicações não embarcadas",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "O aplicativo não pode ser instalado porque a versão em info.xml /versão não é a mesma que a versão relatada na App Store",
+"App directory already exists" => "Diretório App  já existe",
+"Can't create app folder. Please fix permissions. %s" => "Não é possível criar pasta app. Corrija as permissões. %s",
 "Application is not enabled" => "Aplicação não está habilitada",
 "Authentication error" => "Erro de autenticação",
 "Token expired. Please reload page." => "Token expirou. Por favor recarregue a página.",
diff --git a/lib/l10n/sk_SK.php b/lib/l10n/sk_SK.php
index 4101af247c2187141b382f35aade087c85dbd6ec..13487b039d68c79f660a825f883706c9155f2a0f 100644
--- a/lib/l10n/sk_SK.php
+++ b/lib/l10n/sk_SK.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Aplikácia \"%s\" nemôže byť nainštalovaná kvôli nekompatibilite z danou verziou ownCloudu.",
+"No app name specified" => "Nešpecifikované meno aplikácie",
 "Help" => "Pomoc",
 "Personal" => "Osobné",
 "Settings" => "Nastavenia",
@@ -13,6 +15,18 @@ $TRANSLATIONS = array(
 "Back to Files" => "Späť na súbory",
 "Selected files too large to generate zip file." => "Zvolené súbory sú príliš veľké na vygenerovanie zip súboru.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Stiahnite súbory po menších častiach, samostatne, alebo sa obráťte na správcu.",
+"No source specified when installing app" => "Nešpecifikovaný zdroj pri inštalácii aplikácie",
+"No href specified when installing app from http" => "Nešpecifikovaný atribút \"href\" pri inštalácii aplikácie pomocou protokolu \"http\"",
+"No path specified when installing app from local file" => "Nešpecifikovaná cesta pri inštalácii aplikácie z lokálneho súboru",
+"Archives of type %s are not supported" => "Typ archívu %s nie je podporovaný",
+"Failed to open archive when installing app" => "Zlyhanie pri otváraní archívu počas inštalácie aplikácie",
+"App does not provide an info.xml file" => "Aplikácia neposkytuje súbor info.xml",
+"App can't be installed because of not allowed code in the App" => "Aplikácia nemôže byť inštalovaná pre nepovolený kód v aplikácii",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Aplikácia nemôže byť inštalovaná pre nekompatibilitu z danou verziou ownCloudu",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Aplikácia nemôže byť inštalovaná pretože obsahuje <shipped>pravý</shipped> štítok, ktorý nie je povolený pre zaslané \"shipped\" aplikácie",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Aplikácia nemôže byť inštalovaná pretože verzia v info.xml/version nezodpovedá verzii špecifikovanej v aplikačnom obchode",
+"App directory already exists" => "Aplikačný adresár už existuje",
+"Can't create app folder. Please fix permissions. %s" => "Nemožno vytvoriť aplikačný priečinok. Prosím upravte povolenia. %s",
 "Application is not enabled" => "Aplikácia nie je zapnutá",
 "Authentication error" => "Chyba autentifikácie",
 "Token expired. Please reload page." => "Token vypršal. Obnovte, prosím, stránku.",
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
index dd54e6ca5d320e74ecf531bff33f68ebba738b74..e7c3420a85ba9ee9a4f9a822444862d6ad2478d7 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Appen \"%s\" kan inte installeras eftersom att den inte är kompatibel med denna version av ownCloud.",
+"No app name specified" => "Inget appnamn angivet",
 "Help" => "Hjälp",
 "Personal" => "Personligt",
 "Settings" => "Inställningar",
@@ -13,6 +15,18 @@ $TRANSLATIONS = array(
 "Back to Files" => "Tillbaka till Filer",
 "Selected files too large to generate zip file." => "Valda filer är för stora för att skapa zip-fil.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Ladda ner filerna i mindre bitar, separat eller fråga din administratör.",
+"No source specified when installing app" => "Ingen källa angiven vid installation av app ",
+"No href specified when installing app from http" => "Ingen href angiven vid installation av app från http",
+"No path specified when installing app from local file" => "Ingen sökväg angiven vid installation av app från lokal fil",
+"Archives of type %s are not supported" => "Arkiv av typen %s stöds ej",
+"Failed to open archive when installing app" => "Kunde inte öppna arkivet när appen skulle installeras",
+"App does not provide an info.xml file" => "Appen har ingen info.xml fil",
+"App can't be installed because of not allowed code in the App" => "Appen kan inte installeras eftersom att den innehåller otillåten kod",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Appen kan inte installeras eftersom att den inte är kompatibel med denna version av ownCloud",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Appen kan inte installeras eftersom att den innehåller etiketten <shipped>true</shipped> vilket inte är tillåtet för icke inkluderade appar",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Appen kan inte installeras eftersom versionen i info.xml inte är samma som rapporteras från app store",
+"App directory already exists" => "Appens mapp finns redan",
+"Can't create app folder. Please fix permissions. %s" => "Kan inte skapa appens mapp. Var god åtgärda rättigheterna. %s",
 "Application is not enabled" => "Applikationen är inte aktiverad",
 "Authentication error" => "Fel vid autentisering",
 "Token expired. Please reload page." => "Ogiltig token. Ladda om sidan.",
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
index 498469ea8b1f80b06534915dd8486604b6222d24..b63c37c724077d5dbd826c5671e21d94387e280a 100644
--- a/lib/l10n/tr.php
+++ b/lib/l10n/tr.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Owncloud yazılımının bu sürümü ile uyumlu  olmadığı için \"%s\" uygulaması kurulamaz.",
+"No app name specified" => "Uygulama adı belirtimedli",
 "Help" => "Yardım",
 "Personal" => "KiÅŸisel",
 "Settings" => "Ayarlar",
@@ -13,6 +15,18 @@ $TRANSLATIONS = array(
 "Back to Files" => "Dosyalara dön",
 "Selected files too large to generate zip file." => "Seçilen dosyalar bir zip dosyası oluşturmak için fazla büyüktür.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Dosyaları ayrı ayrı, küçük parçalar halinde indirin ya da yöneticinizden yardım isteyin. ",
+"No source specified when installing app" => "Uygulama kurulurken bir kaynak belirtilmedi",
+"No href specified when installing app from http" => "Uygulama kuruluyorken http'de href belirtilmedi.",
+"No path specified when installing app from local file" => "Uygulama yerel dosyadan kuruluyorken dosya yolu belirtilmedi",
+"Archives of type %s are not supported" => "%s arÅŸiv tipi desteklenmiyor",
+"Failed to open archive when installing app" => "Uygulama kuruluyorken arşiv dosyası açılamadı",
+"App does not provide an info.xml file" => "Uygulama info.xml dosyası sağlamıyor",
+"App can't be installed because of not allowed code in the App" => "Uygulamada izin verilmeyeden kodlar olduğu için kurulamıyor.",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Owncloud versiyonunuz ile uyumsuz olduğu için uygulama kurulamıyor.",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Uygulama kurulamıyor. Çünkü  \"non shipped\" uygulamalar için <shipped>true</shipped> tag içermektedir.",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Uygulama kurulamıyor çünkü info.xml/version ile uygulama marketde belirtilen sürüm aynı değil.",
+"App directory already exists" => "App dizini zaten mevcut",
+"Can't create app folder. Please fix permissions. %s" => "app dizini oluşturulamıyor. Lütfen izinleri düzeltin. %s",
 "Application is not enabled" => "Uygulama etkinleÅŸtirilmedi",
 "Authentication error" => "Kimlik doğrulama hatası",
 "Token expired. Please reload page." => "Jetonun süresi geçti. Lütfen sayfayı yenileyin.",
diff --git a/lib/l10n/ug.php b/lib/l10n/ug.php
index 731ad904d7e7480a3c094a52d6ab1ed4b095ff3b..e2cf38ecc8c810f9dbb36a7a63b8f62860529254 100644
--- a/lib/l10n/ug.php
+++ b/lib/l10n/ug.php
@@ -8,6 +8,7 @@ $TRANSLATIONS = array(
 "Files" => "ھۆججەتلەر",
 "Text" => "قىسقا ئۇچۇر",
 "Images" => "سۈرەتلەر",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەڭشەلمەپتۇ، چۈنكى WebDAV نىڭ ئېغىزى بۇزۇلغاندەك تۇرىدۇ.",
 "_%n minute ago_::_%n minutes ago_" => array(""),
 "_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "بۈگۈن",
diff --git a/lib/l10n/zh_CN.GB2312.php b/lib/l10n/zh_CN.GB2312.php
deleted file mode 100644
index bc81ff8fe1b8a5d12528f27dce766edc809efa44..0000000000000000000000000000000000000000
--- a/lib/l10n/zh_CN.GB2312.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "帮助",
-"Personal" => "私人",
-"Settings" => "设置",
-"Users" => "用户",
-"Admin" => "管理员",
-"web services under your control" => "您控制的网络服务",
-"ZIP download is turned off." => "ZIP 下载已关闭",
-"Files need to be downloaded one by one." => "需要逐个下载文件。",
-"Back to Files" => "返回到文件",
-"Selected files too large to generate zip file." => "选择的文件太大而不能生成 zip 文件。",
-"Application is not enabled" => "应用未启用",
-"Authentication error" => "验证错误",
-"Token expired. Please reload page." => "会话过期。请刷新页面。",
-"Files" => "文件",
-"Text" => "文本",
-"Images" => "图片",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "因WebDAV接口故障，您的网络服务器好像并未允许文件同步。",
-"Please double check the <a href='%s'>installation guides</a>." => "请双击<a href='%s'>安装向导</a>。",
-"seconds ago" => "秒前",
-"_%n minute ago_::_%n minutes ago_" => array("%n 分钟以前"),
-"_%n hour ago_::_%n hours ago_" => array("%n 小时以前"),
-"today" => "今天",
-"yesterday" => "昨天",
-"_%n day go_::_%n days ago_" => array("%n 天以前"),
-"last month" => "上个月",
-"_%n month ago_::_%n months ago_" => array("%n 个月以前"),
-"last year" => "去年",
-"years ago" => "年前"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php
index 03bd48de74b83c93e8b770568d902f0c131f20f5..2c34356ea10a00e137591d75b551f5e0e756e4ff 100644
--- a/lib/l10n/zh_CN.php
+++ b/lib/l10n/zh_CN.php
@@ -10,6 +10,7 @@ $TRANSLATIONS = array(
 "Files need to be downloaded one by one." => "需要逐一下载文件",
 "Back to Files" => "回到文件",
 "Selected files too large to generate zip file." => "选择的文件太大，无法生成 zip 文件。",
+"App does not provide an info.xml file" => "应用未提供 info.xml 文件",
 "Application is not enabled" => "应用程序未启用",
 "Authentication error" => "认证出错",
 "Token expired. Please reload page." => "Token 过期，请刷新页面。",
@@ -38,12 +39,12 @@ $TRANSLATIONS = array(
 "Please double check the <a href='%s'>installation guides</a>." => "请认真检查<a href='%s'>安装指南</a>.",
 "seconds ago" => "秒前",
 "_%n minute ago_::_%n minutes ago_" => array("%n 分钟前"),
-"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array("%n 小时前"),
 "today" => "今天",
 "yesterday" => "昨天",
-"_%n day go_::_%n days ago_" => array(""),
+"_%n day go_::_%n days ago_" => array("%n 天前"),
 "last month" => "上月",
-"_%n month ago_::_%n months ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("%n 月前"),
 "last year" => "去年",
 "years ago" => "年前",
 "Could not find category \"%s\"" => "无法找到分类 \"%s\""
diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php
index f405eb88ae948dfa36fb5e8ca17a84c6808b3b87..210c766aa59b36f4b56801e04f9837d7a8a1b36a 100644
--- a/lib/l10n/zh_TW.php
+++ b/lib/l10n/zh_TW.php
@@ -1,15 +1,32 @@
 <?php
 $TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "無法安裝應用程式 %s 因為它和此版本的 ownCloud 不相容。",
+"No app name specified" => "沒有指定應用程式名稱",
 "Help" => "說明",
 "Personal" => "個人",
 "Settings" => "設定",
 "Users" => "使用者",
 "Admin" => "管理",
+"Failed to upgrade \"%s\"." => "升級失敗：%s",
 "web services under your control" => "由您控制的網路服務",
+"cannot open \"%s\"" => "無法開啓 %s",
 "ZIP download is turned off." => "ZIP 下載已關閉。",
 "Files need to be downloaded one by one." => "檔案需要逐一下載。",
 "Back to Files" => "回到檔案列表",
 "Selected files too large to generate zip file." => "選擇的檔案太大以致於無法產生壓縮檔。",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "以小分割下載您的檔案，請詢問您的系統管理員。",
+"No source specified when installing app" => "沒有指定應用程式安裝來源",
+"No href specified when installing app from http" => "從 http 安裝應用程式，找不到 href 屬性",
+"No path specified when installing app from local file" => "從本地檔案安裝應用程式時沒有指定路徑",
+"Archives of type %s are not supported" => "不支援 %s 格式的壓縮檔",
+"Failed to open archive when installing app" => "安裝應用程式時無法開啓壓縮檔",
+"App does not provide an info.xml file" => "應用程式沒有提供 info.xml 檔案",
+"App can't be installed because of not allowed code in the App" => "無法安裝應用程式因為在當中找到危險的代碼",
+"App can't be installed because it is not compatible with this version of ownCloud" => "無法安裝應用程式因為它和此版本的 ownCloud 不相容。",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "無法安裝應用程式，因為它包含了 <shipped>true</shipped> 標籤，在未發行的應用程式當中這是不允許的",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "無法安裝應用程式，因為它在 info.xml/version 宣告的版本與 app store 當中記載的版本不同",
+"App directory already exists" => "應用程式目錄已經存在",
+"Can't create app folder. Please fix permissions. %s" => "無法建立應用程式目錄，請檢查權限：%s",
 "Application is not enabled" => "應用程式未啟用",
 "Authentication error" => "認證錯誤",
 "Token expired. Please reload page." => "Token 過期，請重新整理頁面。",
@@ -37,15 +54,16 @@ $TRANSLATIONS = array(
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的網頁伺服器尚未被正確設定來進行檔案同步，因為您的 WebDAV 界面似乎無法使用。",
 "Please double check the <a href='%s'>installation guides</a>." => "請參考<a href='%s'>安裝指南</a>。",
 "seconds ago" => "幾秒前",
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n minute ago_::_%n minutes ago_" => array("%n 分鐘前"),
+"_%n hour ago_::_%n hours ago_" => array("%n 小時前"),
 "today" => "今天",
 "yesterday" => "昨天",
-"_%n day go_::_%n days ago_" => array(""),
+"_%n day go_::_%n days ago_" => array("%n 天前"),
 "last month" => "上個月",
-"_%n month ago_::_%n months ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("%n 個月前"),
 "last year" => "去年",
 "years ago" => "幾年前",
+"Caused by:" => "原因：",
 "Could not find category \"%s\"" => "找不到分類：\"%s\""
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/log/rotate.php b/lib/log/rotate.php
new file mode 100644
index 0000000000000000000000000000000000000000..bf23ad588b349abd059f82b853c58487ed0a63be
--- /dev/null
+++ b/lib/log/rotate.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Log;
+
+/**
+ * This rotates the current logfile to a new name, this way the total log usage
+ * will stay limited and older entries are available for a while longer.
+ * For more professional log management set the 'logfile' config to a different
+ * location and manage that with your own tools.
+ */
+class Rotate extends \OC\BackgroundJob\Job {
+	private $max_log_size;
+	public function run($logFile) {
+		$this->max_log_size = \OC_Config::getValue('log_rotate_size', false);
+		if ($this->max_log_size) {
+			$filesize = @filesize($logFile);
+			if ($filesize >= $this->max_log_size) {
+				$this->rotate($logFile);
+			}
+		}
+	}
+
+	protected function rotate($logfile) {
+		$rotatedLogfile = $logfile.'.1';
+		rename($logfile, $rotatedLogfile);
+		$msg = 'Log file "'.$logfile.'" was over '.$this->max_log_size.' bytes, moved to "'.$rotatedLogfile.'"';
+		\OC_Log::write('OC\Log\Rotate', $msg, \OC_Log::WARN);
+	}
+}
diff --git a/lib/ocs/cloud.php b/lib/ocs/cloud.php
index 132d923d960ef42b5e3d52e6f77a0e05e7e19b26..2dd99319057792de24bdfd7e4f0660682d994ad7 100644
--- a/lib/ocs/cloud.php
+++ b/lib/ocs/cloud.php
@@ -35,13 +35,49 @@ class OC_OCS_Cloud {
 			'edition' => OC_Util::getEditionString(),
 			);
 			
-			$result['capabilities'] = array(
-				'core' => array(
-					'pollinterval' => OC_Config::getValue('pollinterval', 60),
-					),
-				);
+		$result['capabilities'] = array(
+			'core' => array(
+				'pollinterval' => OC_Config::getValue('pollinterval', 60),
+				),
+			);
+			
 		return new OC_OCS_Result($result);
 	}
+	
+	/**
+	 * gets user info
+	 *
+	 * exposes the quota of an user:
+	 * <data>
+	 *   <quota>
+	 *      <free>1234</free>
+	 *      <used>4321</used>
+	 *      <total>5555</total>
+	 *      <ralative>0.78</ralative>
+	 *   </quota>
+	 * </data>
+	 *
+	 * @param $parameters object should contain parameter 'userid' which identifies
+	 *                           the user from whom the information will be returned
+	 */
+	public static function getUser($parameters) {
+		// Check if they are viewing information on themselves
+		if($parameters['userid'] === OC_User::getUser()) {
+			// Self lookup
+			$quota = array();
+			$storage = OC_Helper::getStorageInfo();
+			$quota = array(
+				'free' =>  $storage['free'],
+				'used' =>  $storage['used'],
+				'total' =>  $storage['total'],
+				'relative' => $storage['relative'],
+				);
+			return new OC_OCS_Result(array('quota' => $quota));
+		} else {
+			// No permission to view this user data
+			return new OC_OCS_Result(null, 997);
+		}
+	}
 
 	public static function getUserPublickey($parameters) {
 
diff --git a/ocs/routes.php b/ocs/routes.php
index 1ea698c7a83e510c2e07e4cf1c5af976f2c8cadb..283c9af6924cc848377d9b492016d80a89180de7 100644
--- a/ocs/routes.php
+++ b/ocs/routes.php
@@ -28,7 +28,7 @@ OC_API::register(
 	array('OC_OCS_Activity', 'activityGet'),
 	'core',
 	OC_API::USER_AUTH
-	); 
+	);
 // Privatedata
 OC_API::register(
 	'get',
@@ -75,3 +75,10 @@ OC_API::register(
 	'core',
 	OC_API::USER_AUTH
 	);
+OC_API::register(
+	'get',
+	'/cloud/users/{userid}',
+	array('OC_OCS_Cloud', 'getUser'),
+	'core',
+	OC_API::USER_AUTH
+	);
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index d409904ebc72ee1703b2b1280cf24942aec8d196..47ceb5ab87379956fe5b5419f4f880e7958b3cab 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -8,7 +8,7 @@ OC_JSON::checkLoggedIn();
 OC_APP::loadApps();
 
 $username = isset($_POST['username']) ? $_POST['username'] : OC_User::getUser();
-$password = isset($_POST['password']) ? $_POST['password'] : null;
+$password = isset($_POST['personal-password']) ? $_POST['personal-password'] : null;
 $oldPassword = isset($_POST['oldpassword']) ? $_POST['oldpassword'] : '';
 $recoveryPassword = isset($_POST['recoveryPassword']) ? $_POST['recoveryPassword'] : null;
 
diff --git a/settings/js/apps.js b/settings/js/apps.js
index d9817aff6b6791e3376a91d642c6508d749b5907..1ae45932172577b81db6e954e201c7bc4254eaf5 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -27,7 +27,15 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		}
 		page.find('small.externalapp').attr('style', 'visibility:visible');
 		page.find('span.author').text(app.author);
-		page.find('span.licence').text(app.license);
+
+		// FIXME licenses of downloaded apps go into app.licence, licenses of not-downloaded apps into app.license
+		var appLicense = '';
+		if (typeof(app.licence) !== 'undefined') {
+			appLicense = app.licence;
+		} else if (typeof(app.license) !== 'undefined') {
+			appLicense = app.license;
+		}
+		page.find('span.licence').text(appLicense);
 
 		if (app.update !== false) {
 			page.find('input.update').show();
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index f87d92ecbe140e9f9502433534a0897ec21440d0..6de7d4518c315713186111cf0f9ee6adff406511 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "Desactiva",
 "Enable" => "Habilita",
 "Please wait...." => "Espereu...",
+"Error while disabling app" => "Error en desactivar l'aplicació",
+"Error while enabling app" => "Error en activar l'aplicació",
 "Updating...." => "Actualitzant...",
 "Error while updating app" => "Error en actualitzar l'aplicació",
 "Error" => "Error",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index a6288e471fdff8a4a22f71d3c10e94b45267c8a5..09caacbb5ae43accf0c8ba7e39307a360d55096a 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -20,12 +20,14 @@ $TRANSLATIONS = array(
 "Disable" => "Zakázat",
 "Enable" => "Povolit",
 "Please wait...." => "Čekejte prosím...",
+"Error while disabling app" => "Chyba při zakazování aplikace",
+"Error while enabling app" => "Chyba při povolování aplikace",
 "Updating...." => "Aktualizuji...",
 "Error while updating app" => "Chyba při aktualizaci aplikace",
 "Error" => "Chyba",
 "Update" => "Aktualizovat",
 "Updated" => "Aktualizováno",
-"Decrypting files... Please wait, this can take some time." => "Probíhá odšifrování souborů... Prosíme počkejte, tato operace může trvat několik minut.",
+"Decrypting files... Please wait, this can take some time." => "Probíhá dešifrování souborů... Čekejte prosím, tato operace může trvat nějakou dobu.",
 "Saving..." => "Ukládám...",
 "deleted" => "smazáno",
 "undo" => "vrátit zpět",
@@ -103,8 +105,8 @@ $TRANSLATIONS = array(
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Použijte <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">tuto adresu pro přístup k vašim souborům přes WebDAV</a>",
 "Encryption" => "Šifrování",
-"The encryption app is no longer enabled, decrypt all your file" => "Šifrovací aplikace již není spuštěna, odšifrujte všechny své soubory",
-"Log-in password" => "Heslo",
+"The encryption app is no longer enabled, decrypt all your file" => "Šifrovací aplikace již není zapnuta, odšifrujte všechny své soubory",
+"Log-in password" => "Přihlašovací heslo",
 "Decrypt all Files" => "Odšifrovat všechny soubory",
 "Login Name" => "Přihlašovací jméno",
 "Create" => "Vytvořit",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index f352dd459f93dc938c36c3923c234e9044678fc1..b34625f75e1296c01e04b5fb4ee7028805463ffb 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "Deaktiver",
 "Enable" => "Aktiver",
 "Please wait...." => "Vent venligst...",
+"Error while disabling app" => "Kunne ikke deaktivere app",
+"Error while enabling app" => "Kunne ikke aktivere app",
 "Updating...." => "Opdaterer....",
 "Error while updating app" => "Der opstod en fejl under app opgraderingen",
 "Error" => "Fejl",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 2c30e51017c05110144a9c6677d428b19527507d..87e935a93c6cf19f61b0efde6fd3a1800324ffb3 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "Deaktivieren",
 "Enable" => "Aktivieren",
 "Please wait...." => "Bitte warten...",
+"Error while disabling app" => "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten",
+"Error while enabling app" => "Beim Aktivieren der Applikation ist ein Fehler aufgetreten",
 "Updating...." => "Aktualisierung...",
 "Error while updating app" => "Fehler beim Aktualisieren der App",
 "Error" => "Fehler",
diff --git a/settings/l10n/de_CH.php b/settings/l10n/de_CH.php
index e3316a9b0392d5eab54fa70b822b9445caaf520d..45650a3b44065dfec62854e800388127e166c32c 100644
--- a/settings/l10n/de_CH.php
+++ b/settings/l10n/de_CH.php
@@ -20,11 +20,14 @@ $TRANSLATIONS = array(
 "Disable" => "Deaktivieren",
 "Enable" => "Aktivieren",
 "Please wait...." => "Bitte warten....",
+"Error while disabling app" => "Fehler während der Deaktivierung der Anwendung",
+"Error while enabling app" => "Fehler während der Aktivierung der Anwendung",
 "Updating...." => "Update...",
 "Error while updating app" => "Es ist ein Fehler während des Updates aufgetreten",
 "Error" => "Fehler",
 "Update" => "Update durchführen",
 "Updated" => "Aktualisiert",
+"Decrypting files... Please wait, this can take some time." => "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
 "Saving..." => "Speichern...",
 "deleted" => "gelöscht",
 "undo" => "rückgängig machen",
@@ -102,6 +105,9 @@ $TRANSLATIONS = array(
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">auf ihre Dateien per WebDAV zuzugreifen</a>.",
 "Encryption" => "Verschlüsselung",
+"The encryption app is no longer enabled, decrypt all your file" => "Die Anwendung zur Verschlüsselung ist nicht länger aktiv, all Ihre Dateien werden entschlüsselt. ",
+"Log-in password" => "Login-Passwort",
+"Decrypt all Files" => "Alle Dateien entschlüsseln",
 "Login Name" => "Loginname",
 "Create" => "Erstellen",
 "Admin Recovery Password" => "Admin-Passwort-Wiederherstellung",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 5a76de7d2e6d2ab150b7f18e2ade63a1a51eff89..6998b51042bd58b1328c362abe56feee696ea14e 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "Deaktivieren",
 "Enable" => "Aktivieren",
 "Please wait...." => "Bitte warten....",
+"Error while disabling app" => "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten",
+"Error while enabling app" => "Beim Aktivieren der Applikation ist ein Fehler aufgetreten",
 "Updating...." => "Update...",
 "Error while updating app" => "Es ist ein Fehler während des Updates aufgetreten",
 "Error" => "Fehler",
@@ -39,7 +41,7 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden",
 "__language_name__" => "Deutsch (Förmlich: Sie)",
 "Security Warning" => "Sicherheitshinweis",
-"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." => "Ihr Datenverzeichnis und Ihre Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers.",
+"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." => "Ihr Datenverzeichnis und Ihre Dateien sind möglicherweise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers.",
 "Setup Warning" => "Einrichtungswarnung",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Bitte überprüfen Sie die <a href=\"%s\">Instalationsanleitungen</a>.",
@@ -48,17 +50,17 @@ $TRANSLATIONS = array(
 "Locale not working" => "Die Lokalisierung funktioniert nicht",
 "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." => "Die System-Ländereinstellung kann nicht auf %s geändert werden. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen, die für %s benötigten Pakete auf ihrem System zu installieren.",
 "Internet connection not working" => "Keine Internetverbindung",
-"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." => "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen.",
+"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." => "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen nutzen wollen.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Eine Aufgabe bei jedem Laden der Seite ausführen",
 "cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php ist als Webcron-Dienst registriert, der die cron.php minütlich per HTTP aufruft.",
-"Use systems cron service to call the cron.php file once a minute." => "Benutzen Sie den System-Crondienst um die cron.php minütlich aufzurufen.",
+"Use systems cron service to call the cron.php file once a minute." => "Benutzen Sie den System-Crondienst, um die cron.php minütlich aufzurufen.",
 "Sharing" => "Teilen",
 "Enable Share API" => "Share-API aktivieren",
 "Allow apps to use the Share API" => "Anwendungen erlauben, die Share-API zu benutzen",
 "Allow links" => "Links erlauben",
 "Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen",
-"Allow public uploads" => "Erlaube öffentliches hochladen",
+"Allow public uploads" => "Öffentliches Hochladen erlauben",
 "Allow users to enable others to upload into their publicly shared folders" => "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen",
 "Allow resharing" => "Erlaube Weiterverteilen",
 "Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..e1a00643908340dd331e78571d3b56826ba5dcae
--- /dev/null
+++ b/settings/l10n/en_GB.php
@@ -0,0 +1,124 @@
+<?php
+$TRANSLATIONS = array(
+"Unable to load list from App Store" => "Unable to load list from App Store",
+"Authentication error" => "Authentication error",
+"Your display name has been changed." => "Your display name has been changed.",
+"Unable to change display name" => "Unable to change display name",
+"Group already exists" => "Group already exists",
+"Unable to add group" => "Unable to add group",
+"Email saved" => "Email saved",
+"Invalid email" => "Invalid email",
+"Unable to delete group" => "Unable to delete group",
+"Unable to delete user" => "Unable to delete user",
+"Language changed" => "Language changed",
+"Invalid request" => "Invalid request",
+"Admins can't remove themself from the admin group" => "Admins can't remove themselves from the admin group",
+"Unable to add user to group %s" => "Unable to add user to group %s",
+"Unable to remove user from group %s" => "Unable to remove user from group %s",
+"Couldn't update app." => "Couldn't update app.",
+"Update to {appversion}" => "Update to {appversion}",
+"Disable" => "Disable",
+"Enable" => "Enable",
+"Please wait...." => "Please wait....",
+"Error while disabling app" => "Error whilst disabling app",
+"Error while enabling app" => "Error whilst enabling app",
+"Updating...." => "Updating....",
+"Error while updating app" => "Error whilst updating app",
+"Error" => "Error",
+"Update" => "Update",
+"Updated" => "Updated",
+"Decrypting files... Please wait, this can take some time." => "Decrypting files... Please wait, this can take some time.",
+"Saving..." => "Saving...",
+"deleted" => "deleted",
+"undo" => "undo",
+"Unable to remove user" => "Unable to remove user",
+"Groups" => "Groups",
+"Group Admin" => "Group Admin",
+"Delete" => "Delete",
+"add group" => "add group",
+"A valid username must be provided" => "A valid username must be provided",
+"Error creating user" => "Error creating user",
+"A valid password must be provided" => "A valid password must be provided",
+"__language_name__" => "__language_name__",
+"Security Warning" => "Security Warning",
+"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." => "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.",
+"Setup Warning" => "Setup Warning",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Please double check the <a href=\"%s\">installation guides</a>.",
+"Module 'fileinfo' missing" => "Module 'fileinfo' missing",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection.",
+"Locale not working" => "Locale not working",
+"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." => "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.",
+"Internet connection not working" => "Internet connection not working",
+"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." => "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.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Execute one task with each page loaded",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php is registered at a webcron service to call cron.php once a minute over http.",
+"Use systems cron service to call the cron.php file once a minute." => "Use systems cron service to call the cron.php file once a minute.",
+"Sharing" => "Sharing",
+"Enable Share API" => "Enable Share API",
+"Allow apps to use the Share API" => "Allow apps to use the Share API",
+"Allow links" => "Allow links",
+"Allow users to share items to the public with links" => "Allow users to share items to the public with links",
+"Allow public uploads" => "Allow public uploads",
+"Allow users to enable others to upload into their publicly shared folders" => "Allow users to enable others to upload into their publicly shared folders",
+"Allow resharing" => "Allow resharing",
+"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",
+"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.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Please connect to your %s via HTTPS to enable or disable the SSL enforcement.",
+"Log" => "Log",
+"Log level" => "Log level",
+"More" => "More",
+"Less" => "Less",
+"Version" => "Version",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "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>.",
+"Add your App" => "Add your App",
+"More Apps" => "More Apps",
+"Select an App" => "Select an App",
+"See application page at apps.owncloud.com" => "See application page at apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>",
+"User Documentation" => "User Documentation",
+"Administrator Documentation" => "Administrator Documentation",
+"Online Documentation" => "Online Documentation",
+"Forum" => "Forum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Commercial Support",
+"Get the apps to sync your files" => "Get the apps to sync your files",
+"Show First Run Wizard again" => "Show First Run Wizard again",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "You have used <strong>%s</strong> of the available <strong>%s</strong>",
+"Password" => "Password",
+"Your password was changed" => "Your password was changed",
+"Unable to change your password" => "Unable to change your password",
+"Current password" => "Current password",
+"New password" => "New password",
+"Change password" => "Change password",
+"Display Name" => "Display Name",
+"Email" => "Email",
+"Your email address" => "Your email address",
+"Fill in an email address to enable password recovery" => "Fill in an email address to enable password recovery",
+"Language" => "Language",
+"Help translate" => "Help translate",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>",
+"Encryption" => "Encryption",
+"The encryption app is no longer enabled, decrypt all your file" => "The encryption app is no longer enabled, decrypt all your files",
+"Log-in password" => "Log-in password",
+"Decrypt all Files" => "Decrypt all Files",
+"Login Name" => "Login Name",
+"Create" => "Create",
+"Admin Recovery Password" => "Admin Recovery Password",
+"Enter the recovery password in order to recover the users files during password change" => "Enter the recovery password in order to recover the user's files during password change",
+"Default Storage" => "Default Storage",
+"Unlimited" => "Unlimited",
+"Other" => "Other",
+"Username" => "Username",
+"Storage" => "Storage",
+"change display name" => "change display name",
+"set new password" => "set new password",
+"Default" => "Default"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 971500305da94438f2537cbe4fbbadbbf9964080..4f3099b8c24c376c7fc48f60510daa9cc108d851 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -60,7 +60,7 @@ $TRANSLATIONS = array(
 "Allow public uploads" => "Permitir subidas públicas",
 "Allow users to enable others to upload into their publicly shared folders" => "Permitir a los usuarios habilitar a otros para subir archivos en sus carpetas compartidas públicamente",
 "Allow resharing" => "Permitir re-compartición",
-"Allow users to share items shared with them again" => "Permitir a los usuarios compartir elementos ya compartidos con ellos mismos",
+"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",
 "Security" => "Seguridad",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index cbe0c838f549efd3c157d12e318f0cc7f9a97747..d779a36cb9b3412f744a5b00bb6a8778f05a2b34 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "Lülita välja",
 "Enable" => "Lülita sisse",
 "Please wait...." => "Palun oota...",
+"Error while disabling app" => "Viga rakendi keelamisel",
+"Error while enabling app" => "Viga rakendi lubamisel",
 "Updating...." => "Uuendamine...",
 "Error while updating app" => "Viga rakenduse uuendamisel",
 "Error" => "Viga",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 9bc90fa63f1f678af53ae2353e6bc1371ecbe315..cf2ff5041c120a81068bf45aacafb04e35247ed7 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "Poista käytöstä",
 "Enable" => "Käytä",
 "Please wait...." => "Odota hetki...",
+"Error while disabling app" => "Virhe poistaessa sovellusta käytöstä",
+"Error while enabling app" => "Virhe ottaessa sovellusta käyttöön",
 "Updating...." => "Päivitetään...",
 "Error while updating app" => "Virhe sovellusta päivittäessä",
 "Error" => "Virhe",
@@ -39,6 +41,7 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Anna kelvollinen salasana",
 "__language_name__" => "_kielen_nimi_",
 "Security Warning" => "Turvallisuusvaroitus",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Lue <a href=\"%s\">asennusohjeet</a> tarkasti.",
 "Module 'fileinfo' missing" => "Moduuli 'fileinfo' puuttuu",
 "Internet connection not working" => "Internet-yhteys ei toimi",
 "Cron" => "Cron",
@@ -53,6 +56,7 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Salli jakaminen vain samoissa ryhmissä olevien käyttäjien kesken",
 "Security" => "Tietoturva",
 "Enforce HTTPS" => "Pakota HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Pakottaa asiakasohjelmistot ottamaan yhteyden %siin salatun yhteyden kautta.",
 "Log" => "Loki",
 "Log level" => "Lokitaso",
 "More" => "Enemmän",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index fb51d793c69d7de97e270261bf2d6c6a93f3ad58..b3e3dfec91b1cd032b816e9516d121ae43f81856 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "Desactivar",
 "Enable" => "Activar",
 "Please wait...." => "Agarde...",
+"Error while disabling app" => "Produciuse un erro ao desactivar o aplicativo",
+"Error while enabling app" => "Produciuse un erro ao activar o aplicativo",
 "Updating...." => "Actualizando...",
 "Error while updating app" => "Produciuse un erro mentres actualizaba o aplicativo",
 "Error" => "Erro",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index d3e4e0e99ac7a6ef6ce16bd889c9467337385309..6e82c9c92f691b84cad25656408d4ff2c5f6697d 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "Uitschakelen",
 "Enable" => "Activeer",
 "Please wait...." => "Even geduld aub....",
+"Error while disabling app" => "Fout tijdens het uitzetten van het programma",
+"Error while enabling app" => "Fout tijdens het aanzetten van het programma",
 "Updating...." => "Bijwerken....",
 "Error while updating app" => "Fout bij bijwerken app",
 "Error" => "Fout",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 78fad69c22e1a89da5d616605ed6de38fb3e2928..7b51025356b2183c952765dcf79deb039a2003af 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "Desabilitar",
 "Enable" => "Habilitar",
 "Please wait...." => "Por favor, aguarde...",
+"Error while disabling app" => "Erro enquanto desabilitava o aplicativo",
+"Error while enabling app" => "Erro enquanto habilitava o aplicativo",
 "Updating...." => "Atualizando...",
 "Error while updating app" => "Erro ao atualizar aplicativo",
 "Error" => "Erro",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 3d05f6bb08d1c6d4e5c584346cbc0a78f9c9f6f9..63e502b8d5b7086fb45d99b2e925f392119ead18 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -25,6 +25,7 @@ $TRANSLATIONS = array(
 "Error" => "Ошибка",
 "Update" => "Обновить",
 "Updated" => "Обновлено",
+"Decrypting files... Please wait, this can take some time." => "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время.",
 "Saving..." => "Сохранение...",
 "deleted" => "удален",
 "undo" => "отмена",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 0d22ad10741e6cde863497b5fcfb9d2f505aeba4..b83407fc3bc3453aaa6b0873190f2295b4941c67 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "Zakázať",
 "Enable" => "Zapnúť",
 "Please wait...." => "Čakajte prosím...",
+"Error while disabling app" => "Chyba pri zablokovaní aplikácie",
+"Error while enabling app" => "Chyba pri povoľovaní aplikácie",
 "Updating...." => "Aktualizujem...",
 "Error while updating app" => "chyba pri aktualizácii aplikácie",
 "Error" => "Chyba",
@@ -103,6 +105,7 @@ $TRANSLATIONS = array(
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Použite túto adresu <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">pre prístup k súborom cez WebDAV</a>",
 "Encryption" => "Å ifrovanie",
+"The encryption app is no longer enabled, decrypt all your file" => "Šifrovacia aplikácia nie je povolená, dešifrujte všetky vaše súbory",
 "Log-in password" => "Prihlasovacie heslo",
 "Decrypt all Files" => "Dešifrovať všetky súbory",
 "Login Name" => "Prihlasovacie meno",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index b7a280625c866ee19afae969310131a1fbf75225..15e0ca9b8d5643e580a38b6098cdfedecb8214eb 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "Deaktivera",
 "Enable" => "Aktivera",
 "Please wait...." => "Var god vänta...",
+"Error while disabling app" => "Fel vid inaktivering av app",
+"Error while enabling app" => "Fel vid aktivering av app",
 "Updating...." => "Uppdaterar...",
 "Error while updating app" => "Fel uppstod vid uppdatering av appen",
 "Error" => "Fel",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index cd9e26742a0a72f6c0ef6d57fc1eb757e56ab2d1..cd90d2f8a01502504765f0180053da85499ff02b 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "Etkin deÄŸil",
 "Enable" => "EtkinleÅŸtir",
 "Please wait...." => "Lütfen bekleyin....",
+"Error while disabling app" => "Uygulama devre dışı bırakılırken hata",
+"Error while enabling app" => "Uygulama etkinleÅŸtirilirken hata",
 "Updating...." => "Güncelleniyor....",
 "Error while updating app" => "Uygulama güncellenirken hata",
 "Error" => "Hata",
diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php
index b62b0a7930e511a63d2aca920128e70ad1325e9c..df9b7e988c1b13af695fb41e3c2e66ffc026411c 100644
--- a/settings/l10n/ug.php
+++ b/settings/l10n/ug.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
 "Unable to delete user" => "ئىشلەتكۈچىنى ئۆچۈرەلمىدى",
 "Language changed" => "تىل ئۆزگەردى",
 "Invalid request" => "ئىناۋەتسىز ئىلتىماس",
+"Admins can't remove themself from the admin group" => "باشقۇرغۇچى ئۆزىنى باشقۇرۇش گۇرۇپپىسىدىن چىقىرىۋېتەلمەيدۇ",
 "Unable to add user to group %s" => "ئىشلەتكۈچىنى %s گۇرۇپپىغا قوشالمايدۇ",
 "Unable to remove user from group %s" => "ئىشلەتكۈچىنى %s گۇرۇپپىدىن چىقىرىۋېتەلمەيدۇ",
 "Couldn't update app." => "ئەپنى يېڭىلىيالمايدۇ.",
@@ -32,6 +33,14 @@ $TRANSLATIONS = array(
 "Group Admin" => "گۇرۇپپا باشقۇرغۇچى",
 "Delete" => "ئۆچۈر",
 "add group" => "گۇرۇپپا قوش",
+"A valid username must be provided" => "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك",
+"Error creating user" => "ئىشلەتكۈچى قۇرۇۋاتقاندا خاتالىق كۆرۈلدى",
+"A valid password must be provided" => "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك",
+"__language_name__" => "ئۇيغۇرچە",
+"Security Warning" => "بىخەتەرلىك ئاگاھلاندۇرۇش",
+"Setup Warning" => "ئاگاھلاندۇرۇش تەڭشەك",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەڭشەلمەپتۇ، چۈنكى WebDAV نىڭ ئېغىزى بۇزۇلغاندەك تۇرىدۇ.",
+"Module 'fileinfo' missing" => "بۆلەك «ھۆججەت ئۇچۇرى» يوقالغان",
 "Sharing" => "ھەمبەھىر",
 "Security" => "بىخەتەرلىك",
 "Log" => "خاتىرە",
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
deleted file mode 100644
index b2457a75e50e9bf2ee3f25a2597a9cd867c5d65c..0000000000000000000000000000000000000000
--- a/settings/l10n/zh_CN.GB2312.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$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" => "Email 保存了",
-"Invalid email" => "非法Email",
-"Unable to delete group" => "未能删除群组",
-"Unable to delete user" => "未能删除用户",
-"Language changed" => "语言改变了",
-"Invalid request" => "非法请求",
-"Admins can't remove themself from the admin group" => "管理员无法将自己从管理组中移除",
-"Unable to add user to group %s" => "未能添加用户到群组 %s",
-"Unable to remove user from group %s" => "未能将用户从群组 %s 移除",
-"Couldn't update app." => "应用无法升级。",
-"Update to {appversion}" => "升级至{appversion}",
-"Disable" => "禁用",
-"Enable" => "启用",
-"Please wait...." => "请稍候……",
-"Updating...." => "升级中……",
-"Error while updating app" => "应用升级时出现错误",
-"Error" => "出错",
-"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__" => "Chinese",
-"Security Warning" => "安全警告",
-"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." => "您的数据文件夹和您的文件或许能够从互联网访问。ownCloud 提供的 .htaccesss 文件未其作用。我们强烈建议您配置网络服务器以使数据文件夹不能从互联网访问，或将移动数据文件夹移出网络服务器文档根目录。",
-"Setup Warning" => "配置注意",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "因WebDAV接口故障，您的网络服务器好像并未允许文件同步。",
-"Please double check the <a href=\"%s\">installation guides</a>." => "请双击<a href='%s'>安装向导</a>。",
-"Module 'fileinfo' missing" => "模块“fileinfo”丢失。",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP 模块“fileinfo”丢失。我们强烈建议打开此模块来获得 mine 类型检测的最佳结果。",
-"Locale not working" => "区域设置未运作",
-"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." => "ownCloud 服务器不能把系统区域设置为 %s。这意味着文件名可内可能含有某些引起问题的字符。我们强烈建议在您的系统上安装必要的区域/语言支持包来支持 “%s” 。",
-"Internet connection not working" => "互联网连接未运作",
-"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." => "服务器没有可用的Internet连接。这意味着像挂载外部储存、版本更新提示和安装第三方插件等功能会失效。远程访问文件和发送邮件提醒也可能会失效。如果您需要这些功能，建议开启服务器的英特网连接。",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "在每个页面载入时执行一项任务",
-"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php 已作为 webcron 服务注册。owncloud 将通过 http 协议每分钟调用一次 cron.php。",
-"Use systems cron service to call the cron.php file once a minute." => "使用系统 cron 服务。通过系统 cronjob 每分钟调用一次 owncloud 文件夹下的 cron.php",
-"Sharing" => "分享",
-"Enable Share API" => "开启分享API",
-"Allow apps to use the Share API" => "允许应用使用分享API",
-"Allow links" => "允许链接",
-"Allow users to share items to the public with links" => "允许用户通过链接共享内容",
-"Allow public uploads" => "允许公众账户上传",
-"Allow users to enable others to upload into their publicly shared folders" => "允许其它人向用户的公众共享文件夹里上传文件",
-"Allow resharing" => "允许转帖",
-"Allow users to share items shared with them again" => "允许用户再次共享已共享的内容",
-"Allow users to share with anyone" => "允许用户向任何人分享",
-"Allow users to only share with users in their groups" => "只允许用户向所在群组中的其他用户分享",
-"Security" => "安全",
-"Enforce HTTPS" => "强制HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "强制客户端通过加密连接与%s连接",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "请通过HTTPS协议连接到 %s，需要启用或者禁止强制SSL的开关。",
-"Log" => "日志",
-"Log level" => "日志等级",
-"More" => "更多",
-"Less" => "æ›´å°‘",
-"Version" => "版本",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社区</a>开发，<a href=\"https://github.com/owncloud\" target=\"_blank\">s源代码</a> 以 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 许可协议发布。",
-"Add your App" => "添加你的应用程序",
-"More Apps" => "更多应用",
-"Select an App" => "选择一个程序",
-"See application page at apps.owncloud.com" => "在owncloud.com上查看应用程序",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>授权协议 <span class=\"author\"></span>",
-"User Documentation" => "用户文档",
-"Administrator Documentation" => "管理员文档",
-"Online Documentation" => "在线说明文档",
-"Forum" => "论坛",
-"Bugtracker" => "Bug追踪者",
-"Commercial Support" => "商业支持",
-"Get the apps to sync your files" => "获取应用并同步您的文件",
-"Show First Run Wizard again" => "再次显示首次运行向导",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "您已使用<strong>%s</strong>/<strong>%s</strong>",
-"Password" => "密码",
-"Your password was changed" => "您的密码以变更",
-"Unable to change your password" => "不能改变你的密码",
-"Current password" => "现在的密码",
-"New password" => "新密码",
-"Change password" => "改变密码",
-"Display Name" => "显示名称",
-"Email" => "电子邮件",
-"Your email address" => "你的email地址",
-"Fill in an email address to enable password recovery" => "输入一个邮箱地址以激活密码恢复功能",
-"Language" => "语言",
-"Help translate" => "帮助翻译",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "访问WebDAV请点击 <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">此处</a>",
-"Encryption" => "加密",
-"Login Name" => "登录名",
-"Create" => "新建",
-"Admin Recovery Password" => "管理员恢复密码",
-"Enter the recovery password in order to recover the users files during password change" => "在恢复密码的过程中请输入恢复密钥来恢复用户数据",
-"Default Storage" => "默认容量",
-"Unlimited" => "无限制",
-"Other" => "其他",
-"Username" => "用户名",
-"Storage" => "容量",
-"change display name" => "更改显示名称",
-"set new password" => "设置新的密码",
-"Default" => "默认"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 82dc8774dfcd2dddea95bbecb8595e3905339074..cc14a3648a847622da2ee11156b880bcdcf36208 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -20,11 +20,14 @@ $TRANSLATIONS = array(
 "Disable" => "禁用",
 "Enable" => "开启",
 "Please wait...." => "请稍等....",
+"Error while disabling app" => "禁用 app 时出错",
+"Error while enabling app" => "启用 app 时出错",
 "Updating...." => "正在更新....",
 "Error while updating app" => "更新 app 时出错",
 "Error" => "错误",
 "Update" => "æ›´æ–°",
 "Updated" => "已更新",
+"Decrypting files... Please wait, this can take some time." => "正在解密文件... 请稍等，可能需要一些时间。",
 "Saving..." => "保存中",
 "deleted" => "已经删除",
 "undo" => "撤销",
@@ -102,6 +105,9 @@ $TRANSLATIONS = array(
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "使用该链接 <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">通过WebDAV访问你的文件</a>",
 "Encryption" => "加密",
+"The encryption app is no longer enabled, decrypt all your file" => "加密 app 未启用，将解密您所有文件",
+"Log-in password" => "登录密码",
+"Decrypt all Files" => "解密所有文件",
 "Login Name" => "登录名称",
 "Create" => "创建",
 "Admin Recovery Password" => "管理恢复密码",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index a11182b5a79ff1479b9c2d9d2b19b0bdc5b05c3a..5cd3679751b3d2187a1d1724b66fb4b40a75f373 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -20,11 +20,14 @@ $TRANSLATIONS = array(
 "Disable" => "停用",
 "Enable" => "啟用",
 "Please wait...." => "請稍候...",
+"Error while disabling app" => "停用應用程式錯誤",
+"Error while enabling app" => "啓用應用程式錯誤",
 "Updating...." => "更新中...",
 "Error while updating app" => "更新應用程式錯誤",
 "Error" => "錯誤",
 "Update" => "æ›´æ–°",
 "Updated" => "已更新",
+"Decrypting files... Please wait, this can take some time." => "檔案解密中，請稍候。",
 "Saving..." => "儲存中...",
 "deleted" => "已刪除",
 "undo" => "復原",
@@ -102,6 +105,9 @@ $TRANSLATIONS = array(
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "使用<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">這個網址</a>來透過 WebDAV 存取您的檔案",
 "Encryption" => "加密",
+"The encryption app is no longer enabled, decrypt all your file" => "加密應用程式已經停用，請您解密您所有的檔案",
+"Log-in password" => "登入密碼",
+"Decrypt all Files" => "解密所有檔案",
 "Login Name" => "登入名稱",
 "Create" => "建立",
 "Admin Recovery Password" => "管理者復原密碼",
diff --git a/settings/personal.php b/settings/personal.php
index e69898f6f8fcacde6b1550a881ea070f48fd4d68..112eaa3c748425e2538f60ef9f87e3c08614960b 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -17,7 +17,7 @@ OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' );
 OC_Util::addStyle( '3rdparty', 'chosen' );
 OC_App::setActiveNavigationEntry( 'personal' );
 
-$storageInfo=OC_Helper::getStorageInfo();
+$storageInfo=OC_Helper::getStorageInfo('/');
 
 $email=OC_Preferences::getValue(OC_User::getUser(), 'settings', 'email', '');
 
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index bad88142da9fb7526788f866dc5c72c16728865a..63e1258b958e692cabbd83b0820afe8e8f9f78f1 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -40,7 +40,7 @@ if($_['passwordChangeSupported']) {
 		<div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div>
 		<div id="passworderror"><?php echo $l->t('Unable to change your password');?></div>
 		<input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" />
-		<input type="password" id="pass2" name="password"
+		<input type="password" id="pass2" name="personal-password"
 			placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#personal-show" />
 		<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
 		<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
diff --git a/status.php b/status.php
index 179fe3f49f2070f37a2b0f2a60092eabdbc1e06e..88422100f14cf96afb6b637ecb139520efa8807e 100644
--- a/status.php
+++ b/status.php
@@ -33,8 +33,11 @@ try {
 		'version'=>implode('.', OC_Util::getVersion()),
 		'versionstring'=>OC_Util::getVersionString(),
 		'edition'=>OC_Util::getEditionString());
-
-	echo(json_encode($values));
+	if (OC::$CLI) {
+		print_r($values);
+	} else {
+		echo(json_encode($values));
+	}
 
 } catch (Exception $ex) {
 	OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
diff --git a/tests/lib/connector/sabre/quotaplugin.php b/tests/lib/connector/sabre/quotaplugin.php
new file mode 100644
index 0000000000000000000000000000000000000000..1186de28742bdf76c502344b416ce44b915c5841
--- /dev/null
+++ b/tests/lib/connector/sabre/quotaplugin.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas Müller <thomas.mueller@tmit.eu>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class Test_OC_Connector_Sabre_QuotaPlugin extends PHPUnit_Framework_TestCase {
+
+	/**
+	 * @var Sabre_DAV_Server
+	 */
+	private $server;
+
+	/**
+	 * @var OC_Connector_Sabre_QuotaPlugin
+	 */
+	private $plugin;
+
+	public function setUp() {
+		$this->server = new Sabre_DAV_Server();
+		$this->plugin = new OC_Connector_Sabre_QuotaPlugin();
+		$this->plugin->initialize($this->server);
+	}
+
+	/**
+	 * @dataProvider lengthProvider
+	 */
+	public function testLength($expected, $headers)
+	{
+		$this->server->httpRequest = new Sabre_HTTP_Request($headers);
+		$length = $this->plugin->getLength();
+		$this->assertEquals($expected, $length);
+	}
+
+	/**
+	 * @dataProvider quotaOkayProvider
+	 */
+	public function testCheckQuota($quota, $headers)
+	{
+		$this->plugin->fileView = $this->buildFileViewMock($quota);
+
+		$this->server->httpRequest = new Sabre_HTTP_Request($headers);
+		$result = $this->plugin->checkQuota('');
+		$this->assertTrue($result);
+	}
+
+	/**
+	 * @expectedException Sabre_DAV_Exception_InsufficientStorage
+	 * @dataProvider quotaExceededProvider
+	 */
+	public function testCheckExceededQuota($quota, $headers)
+	{
+		$this->plugin->fileView = $this->buildFileViewMock($quota);
+
+		$this->server->httpRequest = new Sabre_HTTP_Request($headers);
+		$this->plugin->checkQuota('');
+	}
+
+	public function quotaOkayProvider() {
+		return array(
+			array(1024, array()),
+			array(1024, array('HTTP_X_EXPECTED_ENTITY_LENGTH' => '1024')),
+			array(1024, array('HTTP_CONTENT_LENGTH' => '512')),
+			array(1024, array('HTTP_OC_TOTAL_LENGTH' => '1024', 'HTTP_CONTENT_LENGTH' => '512')),
+			// OC\Files\FREE_SPACE_UNKNOWN = -2
+			array(-2, array()),
+			array(-2, array('HTTP_X_EXPECTED_ENTITY_LENGTH' => '1024')),
+			array(-2, array('HTTP_CONTENT_LENGTH' => '512')),
+			array(-2, array('HTTP_OC_TOTAL_LENGTH' => '1024', 'HTTP_CONTENT_LENGTH' => '512')),
+		);
+	}
+
+	public function quotaExceededProvider() {
+		return array(
+			array(1023, array('HTTP_X_EXPECTED_ENTITY_LENGTH' => '1024')),
+			array(511, array('HTTP_CONTENT_LENGTH' => '512')),
+			array(2047, array('HTTP_OC_TOTAL_LENGTH' => '2048', 'HTTP_CONTENT_LENGTH' => '1024')),
+		);
+	}
+
+	public function lengthProvider() {
+		return array(
+			array(null, array()),
+			array(1024, array('HTTP_X_EXPECTED_ENTITY_LENGTH' => '1024')),
+			array(512, array('HTTP_CONTENT_LENGTH' => '512')),
+			array(2048, array('HTTP_OC_TOTAL_LENGTH' => '2048', 'HTTP_CONTENT_LENGTH' => '1024')),
+			array(4096, array('HTTP_OC_TOTAL_LENGTH' => '2048', 'HTTP_X_EXPECTED_ENTITY_LENGTH' => '4096')),
+		);
+	}
+
+	private function buildFileViewMock($quota) {
+		// mock filesysten
+		$view = $this->getMock('\OC\Files\View', array('free_space'), array(), '', FALSE);
+		$view->expects($this->any())->method('free_space')->withAnyParameters()->will($this->returnValue($quota));
+
+		return $view;
+	}
+
+}
diff --git a/tests/lib/group/group.php b/tests/lib/group/group.php
index 75e975d9e6505bb60e3bb45248b545faac0afc94..f1fda3b928836d1c0bac790cc404f2de1746f97d 100644
--- a/tests/lib/group/group.php
+++ b/tests/lib/group/group.php
@@ -43,8 +43,8 @@ class Group extends \PHPUnit_Framework_TestCase {
 		$users = $group->getUsers();
 
 		$this->assertEquals(2, count($users));
-		$user1 = $users[0];
-		$user2 = $users[1];
+		$user1 = $users['user1'];
+		$user2 = $users['user2'];
 		$this->assertEquals('user1', $user1->getUID());
 		$this->assertEquals('user2', $user2->getUID());
 	}
@@ -68,9 +68,9 @@ class Group extends \PHPUnit_Framework_TestCase {
 		$users = $group->getUsers();
 
 		$this->assertEquals(3, count($users));
-		$user1 = $users[0];
-		$user2 = $users[1];
-		$user3 = $users[2];
+		$user1 = $users['user1'];
+		$user2 = $users['user2'];
+		$user3 = $users['user3'];
 		$this->assertEquals('user1', $user1->getUID());
 		$this->assertEquals('user2', $user2->getUID());
 		$this->assertEquals('user3', $user3->getUID());