merge master into filesystem

2012-12-25 14:29:29 +01:00 · 2012-12-25 14:29:29 +01:00 · 7e36f730ec
commit 7e36f730ec
parent bf05ff351f 5d59ac0739
366 changed files with 7903 additions and 5683 deletions
--- a/.gitignore
+++ b/.gitignore
@ -55,3 +55,9 @@ nbproject
 # WebFinger
 .well-known
 /.buildpath
+
+#tests - autogenerated filed
+data-autotest
+/tests/coverage*
+/tests/autoconfig*
+/tests/autotest*
--- a/apps/files/ajax/timezone.php
+++ b/apps/files/ajax/timezone.php
@ -1,2 +0,0 @@
-<?php
-$_SESSION['timezone'] = $_GET['time'];
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@ -12,16 +12,16 @@
 #new.active { border-bottom-left-radius:0; border-bottom-right-radius:0; border-bottom:none; }
 #new>a { padding:.5em 1.2em .3em; }
 #new>ul {
-	display:none; position:fixed; min-width:7em; z-index:-1;
-	padding:.5em; margin-top:0.075em; margin-left:-.5em; 
+	display:none; position:fixed; min-width:7em; z-index:10;
+	padding:.5em; padding-bottom:0; margin-top:.075em; margin-left:-.5em;
 	text-align:left;
-	background:#f8f8f8; border:1px solid #ddd;
+	background:#f8f8f8; border:1px solid #ddd; border-radius:10px; border-top-left-radius:0;
+	box-shadow:0 2px 7px rgba(170,170,170,.4);
 }
 #new>ul>li { height:20px; margin:.3em; padding-left:2em; padding-bottom:0.1em;
 		background-repeat:no-repeat; cursor:pointer; }
 #new>ul>li>p { cursor:pointer; }
 #new>ul>li>input { padding:0.3em; margin:-0.3em; }
-#new .popup { border-top-left-radius:0; z-index:10; }

 #upload { 
 	height:27px; padding:0; margin-left:0.2em; overflow:hidden;
@ -64,11 +64,17 @@ tr:hover span.extension { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Op
 table tr.mouseOver td { background-color:#eee; }
 table th { height:2em; padding:0 .5em; color:#999; }
 table th .name { float:left; margin-left:.5em; }
-table th.multiselect { background:#ddd; color:#000; font-weight:bold; }
 table th, table td { border-bottom:1px solid #ddd; text-align:left; font-weight:normal; }
 table td { border-bottom:1px solid #eee; font-style:normal; background-position:1em .5em; background-repeat:no-repeat; }
-table th#headerSize, table td.filesize { width:3em; padding:0 1em; text-align:right; }
-table th#headerDate, table td.date { width:11em; padding:0 .1em 0 1em; text-align:left; }
+table th#headerName { width:100em; /* not really sure why this works better than 100% … table styling */ }
+table th#headerSize, table td.filesize { min-width:3em; padding:0 1em; text-align:right; }
+table th#headerDate, table td.date { min-width:11em; padding:0 .1em 0 1em; text-align:left; }
+
+/* Multiselect bar */
+table.multiselect { top:63px; }
+table.multiselect thead { position:fixed; top:82px; z-index:1; }
+table.multiselect thead th { background:rgba(230,230,230,.8); color:#000; font-weight:bold; border-bottom:0; }
+
 table td.selection, table th.selection, table td.fileaction { width:2em; text-align:center; }
 table td.filename a.name { display:block; height:1.5em; vertical-align:middle; margin-left:3em; }
 table tr[data-type="dir"] td.filename a.name span.nametext {font-weight:bold; }
@ -79,15 +85,28 @@ table td.filename .nametext, .uploadtext, .modified { float:left; padding:.3em 0
 table td.filename .nametext { overflow:hidden; text-overflow:ellipsis; }
 table td.filename .uploadtext { font-weight:normal; margin-left:.5em; }
 table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
-table thead.fixed tr{ position:fixed; top:6.5em; z-index:49; -moz-box-shadow:0 -3px 7px #ddd; -webkit-box-shadow:0 -3px 7px #ddd; box-shadow:0 -3px 7px #ddd; }
-table thead.fixed { height:2em; }
 #fileList tr td.filename>input[type="checkbox"]:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; float:left; margin:.7em 0 0 1em; /* bigger clickable area doesn’t work in FF width:2.8em; height:2.4em;*/ -webkit-transition:opacity 200ms; -moz-transition:opacity 200ms; -o-transition:opacity 200ms; transition:opacity 200ms; }
 #fileList tr td.filename>input[type="checkbox"]:hover:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
 #fileList tr td.filename>input[type="checkbox"]:checked:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
-#fileList tr td.filename { -webkit-transition:background-image 500ms; -moz-transition:background-image 500ms; -o-transition:background-image 500ms; transition:background-image 500ms; position:relative; }
+#fileList tr td.filename {
+	position:relative; width:100%;
+	-webkit-transition:background-image 500ms; -moz-transition:background-image 500ms; -o-transition:background-image 500ms; transition:background-image 500ms;
+}
 #select_all { float:left; margin:.3em 0.6em 0 .5em; }
 #uploadsize-message,#delete-confirm { display:none; }
-.fileactions { position:relative; top:.3em; font-size:.8em; float:right; }
+
+/* File actions */
+.fileactions {
+	position:absolute; top:.6em; right:0;
+	font-size:.8em;
+}
+#fileList .name { position:relative; /* Firefox needs to explicitly have this default set … */ }
+#fileList tr:hover .fileactions { /* background to distinguish when overlaying with file names */
+	background:rgba(248,248,248,.9); box-shadow:-5px 0 7px rgba(248,248,248,.9);
+}
+#fileList tr.selected:hover .fileactions { /* slightly darker color for selected rows */
+	background:rgba(238,238,238,.9); box-shadow:-5px 0 7px rgba(238,238,238,.9);
+}
 #fileList .fileactions a.action img { position:relative; top:.2em; }
 #fileList a.action { display:inline; margin:-.5em 0; padding:1em .5em 1em .5em !important; }
 a.action.delete { float:right; }
--- a/apps/files/download.php
+++ b/apps/files/download.php
@ -40,7 +40,12 @@ if(!\OC\Files\Filesystem::file_exists($filename)) {
 $ftype=\OC\Files\Filesystem::getMimeType( $filename );

 header('Content-Type:'.$ftype);
-header('Content-Disposition: attachment; filename="'.basename($filename).'"');
+if ( preg_match( "/MSIE/", $_SERVER["HTTP_USER_AGENT"] ) ) {
+	header( 'Content-Disposition: attachment; filename="' . rawurlencode( basename($filename) ) . '"' );
+} else {
+	header( 'Content-Disposition: attachment; filename*=UTF-8\'\'' . rawurlencode( basename($filename) )
+										 . '; filename="' . rawurlencode( basename($filename) ) . '"' );
+}
 OCP\Response::disableCaching();
 header('Content-Length: '.\OC\Files\Filesystem::filesize($filename));

--- a/apps/files/index.php
+++ b/apps/files/index.php
@ -1,45 +1,43 @@
 <?php

 /**
-* ownCloud - ajax frontend
-*
-* @author Robin Appelman
-* @copyright 2010 Robin Appelman icewind1991@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/>.
-*
-*/
+ * ownCloud - ajax frontend
+ *
+ * @author Robin Appelman
+ * @copyright 2010 Robin Appelman icewind1991@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/>.
+ *
+ */

 // Check if we are a user
 OCP\User::checkLoggedIn();

 // Load the files we need
-OCP\Util::addStyle( 'files', 'files' );
-OCP\Util::addscript( 'files', 'jquery.iframe-transport' );
-OCP\Util::addscript( 'files', 'jquery.fileupload' );
-OCP\Util::addscript( 'files', 'files' );
-OCP\Util::addscript( 'files', 'filelist' );
-OCP\Util::addscript( 'files', 'fileactions' );
-OCP\Util::addscript( 'files', 'keyboardshortcuts' ); 
-if(!isset($_SESSION['timezone'])) {
-	OCP\Util::addscript( 'files', 'timezone' );
-}
-OCP\App::setActiveNavigationEntry( 'files_index' );
+OCP\Util::addStyle('files', 'files');
+OCP\Util::addscript('files', 'jquery.iframe-transport');
+OCP\Util::addscript('files', 'jquery.fileupload');
+OCP\Util::addscript('files', 'files');
+OCP\Util::addscript('files', 'filelist');
+OCP\Util::addscript('files', 'fileactions');
+OCP\Util::addscript('files', 'keyboardshortcuts');
+
+OCP\App::setActiveNavigationEntry('files_index');
 // Load the files
-$dir = isset( $_GET['dir'] ) ? stripslashes($_GET['dir']) : '';
+$dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
 // Redirect if directory does not exist
-if(!\OC\Files\Filesystem::is_dir($dir.'/')) {
+if(!\OC\Files\Filesystem::is_dir($dir . '/')) {
 	header('Location: '.$_SERVER['SCRIPT_NAME'].'');
 	exit();
 }
@ -57,9 +55,9 @@ function fileCmp($a, $b) {
 $files = array();
 foreach( \OC\Files\Filesystem::getDirectoryContent( $dir ) as $i ) {
 	$i['date'] = OCP\Util::formatDate($i['mtime'] );
-	if($i['type']=='file') {
-		$fileinfo=pathinfo($i['name']);
-		$i['basename']=$fileinfo['filename'];
+	if($i['type'] == 'file') {
+		$fileinfo = pathinfo($i['name']);
+		$i['basename'] = $fileinfo['filename'];
 		if (!empty($fileinfo['extension'])) {
 			$i['extension']='.' . $fileinfo['extension'];
 		}
@ -78,47 +76,47 @@ $breadcrumb = array();
 $pathtohere = '';
 foreach( explode( '/', $dir ) as $i ) {
 	if( $i != '' ) {
-		$pathtohere .= '/'.str_replace('+','%20', urlencode($i));
+		$pathtohere .= '/' . $i;
 		$breadcrumb[] = array( 'dir' => $pathtohere, 'name' => $i );
 	}
 }

 // make breadcrumb und filelist markup
-$list = new OCP\Template( 'files', 'part.list', '' );
-$list->assign( 'files', $files, false );
-$list->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'?dir=', false);
-$list->assign( 'downloadURL', OCP\Util::linkTo('files', 'download.php').'?file=', false);
-$breadcrumbNav = new OCP\Template( 'files', 'part.breadcrumb', '' );
-$breadcrumbNav->assign( 'breadcrumb', $breadcrumb, false );
-$breadcrumbNav->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'?dir=', false);
+$list = new OCP\Template('files', 'part.list', '');
+$list->assign('files', $files, false);
+$list->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=', false);
+$list->assign('downloadURL', OCP\Util::linkTo('files', 'download.php') . '?file=', false);
+$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
+$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
+$breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=', false);

 $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
 $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
 $maxUploadFilesize = min($upload_max_filesize, $post_max_size);

-$freeSpace=\OC\Files\Filesystem::free_space($dir);
-$freeSpace=max($freeSpace,0);
+$freeSpace = \OC\Files\Filesystem::free_space($dir);
+$freeSpace = max($freeSpace,0);
 $maxUploadFilesize = min($maxUploadFilesize, $freeSpace);

 $permissions = OCP\PERMISSION_READ;
-if (OC_Filesystem::isUpdatable($dir.'/')) {
-	$permissions |= OCP\PERMISSION_UPDATE;
+if (\OC\Files\Filesystem::isUpdatable($dir . '/')) {
+    $permissions |= OCP\PERMISSION_UPDATE;
 }
-if (OC_Filesystem::isDeletable($dir.'/')) {
-	$permissions |= OCP\PERMISSION_DELETE;
+if (\OC\Files\Filesystem::isDeletable($dir . '/')) {
+    $permissions |= OCP\PERMISSION_DELETE;
 }
-if (OC_Filesystem::isSharable($dir.'/')) {
-	$permissions |= OCP\PERMISSION_SHARE;
+if (\OC\Files\Filesystem::isSharable($dir . '/')) {
+    $permissions |= OCP\PERMISSION_SHARE;
 }

 $tmpl = new OCP\Template( 'files', 'index', 'user' );
 $tmpl->assign( 'fileList', $list->fetchPage(), false );
 $tmpl->assign( 'breadcrumb', $breadcrumbNav->fetchPage(), false );
 $tmpl->assign( 'dir', \OC\Files\Filesystem::normalizePath($dir));
-$tmpl->assign( 'isCreatable', \OC\Files\Filesystem::isCreatable($dir.'/'));
+$tmpl->assign( 'isCreatable', \OC\Files\Filesystem::isCreatable($dir . '/'));
 $tmpl->assign('permissions', $permissions);
-$tmpl->assign( 'files', $files );
-$tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
-$tmpl->assign( 'uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
-$tmpl->assign( 'allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
+$tmpl->assign('files', $files);
+$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
+$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
+$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
 $tmpl->printPage();
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@ -203,6 +203,9 @@ $(document).ready(function() {
 				var files = data.files;
 				var totalSize=0;
 				if(files){
+					if (FileList.lastAction) {
+						FileList.lastAction();
+					}
 					for(var i=0;i<files.length;i++){
 						if(files[i].size ==0 && files[i].type== '')
 						{
@ -513,6 +516,9 @@ $(document).ready(function() {
 				$('#notification').fadeIn();
 				return;
 			}
+			if (FileList.lastAction) {
+				FileList.lastAction();
+			}
 			var name = getUniqueName($(this).val());
 			if (name != $(this).val()) {
 				FileList.checkName(name, $(this).val(), true);
@ -762,22 +768,14 @@ function procesSelection(){
 	var selected=getSelectedFiles();
 	var selectedFiles=selected.filter(function(el){return el.type=='file'});
 	var selectedFolders=selected.filter(function(el){return el.type=='dir'});
-	if(selectedFiles.length==0 && selectedFolders.length==0){
+	if(selectedFiles.length==0 && selectedFolders.length==0) {
 		$('#headerName>span.name').text(t('files','Name'));
 		$('#headerSize').text(t('files','Size'));
 		$('#modified').text(t('files','Modified'));
-		$('th').removeClass('multiselect');
+		$('table').removeClass('multiselect');
 		$('.selectedActions').hide();
-		$('thead').removeClass('fixed');
-		$('#headerName').css('width','auto');
-		$('#headerSize').css('width','auto');
-		$('#headerDate').css('width','auto');
-		$('table').css('padding-top','0');
-	}else{
-		var width={name:$('#headerName').css('width'),size:$('#headerSize').css('width'),date:$('#headerDate').css('width')};
-		$('#headerName').css('width',width.name);
-		$('#headerSize').css('width',width.size);
-		$('#headerDate').css('width',width.date);
+	}
+	else {
 		$('.selectedActions').show();
 		var totalSize=0;
 		for(var i=0;i<selectedFiles.length;i++){
@ -809,7 +807,7 @@ function procesSelection(){
 		}
 		$('#headerName>span.name').text(selection);
 		$('#modified').text('');
-		$('th').addClass('multiselect');
+		$('table').addClass('multiselect');
 	}
 }

--- a/apps/files/js/keyboardshortcuts.js
+++ b/apps/files/js/keyboardshortcuts.js
@ -127,6 +127,9 @@ var Files = Files || {};
 	}
 	Files.bindKeyboardShortcuts = function(document, $) {
 		$(document).keydown(function(event) { //check for modifier keys
+            if(!$(event.target).is('body')) {
+                return;
+            }
 			var preventDefault = false;
 			if ($.inArray(event.keyCode, keys) === -1) keys.push(event.keyCode);
 			if (
--- a/apps/files/js/timezone.js
+++ b/apps/files/js/timezone.js
@ -1,12 +0,0 @@
-//send the clients time zone to the server
-$(document).ready(function() {
-	var visitortimezone = (-new Date().getTimezoneOffset()/60);
-	$.ajax({
-		type: "GET",
-		url: OC.filePath('files', 'ajax', 'timezone.php'),
-		data: 'time='+ visitortimezone,
-		success: function(){
-			location.reload();
-		}
-	});
-});
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Der er ingen fejl, filen blev uploadet med success",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uploadede fil overskrider MAX_FILE_SIZE -direktivet som er specificeret i HTML-formularen",
 "The uploaded file was only partially uploaded" => "Den uploadede file blev kun delvist uploadet",
 "No file was uploaded" => "Ingen fil blev uploadet",
@ -18,6 +19,7 @@
 "replaced {new_name} with {old_name}" => "erstattede {new_name} med {old_name}",
 "unshared {files}" => "ikke delte {files}",
 "deleted {files}" => "slettede {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt.",
 "generating ZIP-file, it may take some time." => "genererer ZIP-fil, det kan tage lidt tid.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kunne ikke uploade din fil, da det enten er en mappe eller er tom",
 "Upload Error" => "Fejl ved upload",
@ -27,6 +29,7 @@
 "{count} files uploading" => "{count} filer uploades",
 "Upload cancelled." => "Upload afbrudt.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud",
 "{count} files scanned" => "{count} filer skannet",
 "error while scanning" => "fejl under scanning",
 "Name" => "Navn",
@ -47,6 +50,7 @@
 "New" => "Ny",
 "Text file" => "Tekstfil",
 "Folder" => "Mappe",
+"From link" => "Fra link",
 "Upload" => "Upload",
 "Cancel upload" => "Fortryd upload",
 "Nothing in here. Upload something!" => "Her er tomt. Upload noget!",
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@ -1,21 +1,44 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Нема грешка, датотеката беше подигната успешно",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Подигнатата датотека ја надминува upload_max_filesize директивата во php.ini:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Подигнатата датотеката ја надминува MAX_FILE_SIZE директивата која беше поставена во HTML формата",
 "The uploaded file was only partially uploaded" => "Датотеката беше само делумно подигната.",
 "No file was uploaded" => "Не беше подигната датотека",
 "Missing a temporary folder" => "Не постои привремена папка",
 "Failed to write to disk" => "Неуспеав да запишам на диск",
 "Files" => "Датотеки",
+"Unshare" => "Не споделувај",
 "Delete" => "Избриши",
+"Rename" => "Преименувај",
+"{new_name} already exists" => "{new_name} веќе постои",
+"replace" => "замени",
+"suggest name" => "предложи име",
+"cancel" => "откажи",
+"replaced {new_name}" => "земенета {new_name}",
+"undo" => "врати",
+"replaced {new_name} with {old_name}" => "заменета {new_name} со {old_name}",
+"unshared {files}" => "без споделување {files}",
+"deleted {files}" => "избришани {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени.",
 "generating ZIP-file, it may take some time." => "Се генерира ZIP фајлот, ќе треба извесно време.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти",
 "Upload Error" => "Грешка при преземање",
 "Close" => "Затвои",
 "Pending" => "Чека",
+"1 file uploading" => "1 датотека се подига",
+"{count} files uploading" => "{count} датотеки се подигаат",
 "Upload cancelled." => "Преземањето е прекинато.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Неправилно име на папка. Користењето на „Shared“ е резервирано за Owncloud",
+"{count} files scanned" => "{count}  датотеки скенирани",
+"error while scanning" => "грешка при скенирање",
 "Name" => "Име",
 "Size" => "Големина",
 "Modified" => "Променето",
+"1 folder" => "1 папка",
+"{count} folders" => "{count} папки",
+"1 file" => "1 датотека",
+"{count} files" => "{count} датотеки",
 "File handling" => "Ракување со датотеки",
 "Maximum upload size" => "Максимална големина за подигање",
 "max. possible: " => "макс. можно:",
@ -27,6 +50,7 @@
 "New" => "Ново",
 "Text file" => "Текстуална датотека",
 "Folder" => "Папка",
+"From link" => "Од врска",
 "Upload" => "Подигни",
 "Cancel upload" => "Откажи прикачување",
 "Nothing in here. Upload something!" => "Тука нема ништо. Снимете нешто!",
--- a/apps/files/l10n/ru_RU.php
+++ b/apps/files/l10n/ru_RU.php
@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Ошибка отсутствует, файл загружен успешно.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Размер загружаемого файла превышает upload_max_filesize директиву в php.ini:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Размер загруженного",
 "The uploaded file was only partially uploaded" => "Загружаемый файл был загружен частично",
 "No file was uploaded" => "Файл не был загружен",
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "ไม่มีข้อผิดพลาดใดๆ ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "ขนาดไฟล์ที่อัพโหลดมีขนาดเกิน upload_max_filesize ที่ระบุไว้ใน php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "ไฟล์ที่อัพโหลดมีขนาดเกินคำสั่ง MAX_FILE_SIZE ที่ระบุเอาไว้ในรูปแบบคำสั่งในภาษา HTML",
 "The uploaded file was only partially uploaded" => "ไฟล์ที่อัพโหลดยังไม่ได้ถูกอัพโหลดอย่างสมบูรณ์",
 "No file was uploaded" => "ยังไม่มีไฟล์ที่ถูกอัพโหลด",
--- a/apps/files/templates/admin.php
+++ b/apps/files/templates/admin.php
@ -15,11 +15,11 @@

 		<input name="maxZipInputSize" id="maxZipInputSize" style="width:180px;" value='<?php echo $_['maxZipInputSize'] ?>'
 			   title="<?php echo $l->t( '0 is unlimited' ); ?>"
-			   <?php if (!$_['allowZipDownload']): ?> disabled="disabled"<?php endif; ?> />
-		<label for="maxZipInputSize"><?php echo $l->t( 'Maximum input size for ZIP files' ); ?> </label><br />
+			   <?php if (!$_['allowZipDownload']): ?> disabled="disabled"<?php endif; ?> /><br />
+		<em><?php echo $l->t( 'Maximum input size for ZIP files' ); ?> </em><br />

 		<input type="hidden" value="<?php echo $_['requesttoken']; ?>" name="requesttoken" />
 		<input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings"
 			   value="<?php echo $l->t( 'Save' ); ?>"/>
 	</fieldset>
-</form>
+</form>
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@ -5,7 +5,7 @@
 		<div class="actions <?php if (isset($_['files']) and count($_['files'])==0):?>emptyfolder<?php endif; ?>">
 			<div id="new" class="button">
 				<a><?php echo $l->t('New');?></a>
-				<ul class="popup popupTop">
+				<ul>
 					<li style="background-image:url('<?php echo OCP\mimetype_icon('text/plain') ?>')"
 						data-type='file'><p><?php echo $l->t('Text file');?></p></li>
 					<li style="background-image:url('<?php echo OCP\mimetype_icon('dir') ?>')"
--- a/apps/files_encryption/l10n/mk.php
+++ b/apps/files_encryption/l10n/mk.php
@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Енкрипција",
+"Exclude the following file types from encryption" => "Исклучи ги следните типови на датотеки од енкрипција",
+"None" => "Ништо",
+"Enable Encryption" => "Овозможи енкрипција"
+);
--- a/apps/files_encryption/settings.php
+++ b/apps/files_encryption/settings.php
@ -6,6 +6,8 @@
 * See the COPYING-README file.
 */

+OC_Util::checkAdminUser();
+
 $tmpl = new OCP\Template( 'files_encryption', 'settings');
 $blackList=explode(',', OCP\Config::getAppValue('files_encryption',
 												'type_blacklist',
@ -17,4 +19,4 @@ $tmpl->assign('encryption_enabled', $enabled);
 OCP\Util::addscript('files_encryption', 'settings');
 OCP\Util::addscript('core', 'multiselect');

-return $tmpl->fetchPage();
+return $tmpl->fetchPage();
--- a/apps/files_encryption/templates/settings.php
+++ b/apps/files_encryption/templates/settings.php
@ -1,14 +1,14 @@
 <form id="calendar">
 	<fieldset class="personalblock">
-	<strong><?php echo $l->t('Encryption'); ?></strong>
-		<?php echo $l->t('Exclude the following file types from encryption'); ?>
+		<legend><strong><?php echo $l->t('Encryption');?></strong></legend>
+		<input type='checkbox'<?php if ($_['encryption_enabled']): ?> checked="checked"<?php endif; ?>
+			   id='enable_encryption' ></input>
+		<label for='enable_encryption'><?php echo $l->t('Enable Encryption')?></label><br />
 		<select id='encryption_blacklist' title="<?php echo $l->t('None')?>" multiple="multiple">
 			<?php foreach ($_['blacklist'] as $type): ?>
 				<option selected="selected" value="<?php echo $type;?>"><?php echo $type;?></option>
 			<?php endforeach;?>
-		</select>
-		<input type='checkbox'<?php if ($_['encryption_enabled']): ?> checked="checked"<?php endif; ?>
-			   id='enable_encryption' ></input>
-		<label for='enable_encryption'><?php echo $l->t('Enable Encryption')?></label>
+		</select><br />
+		<?php echo $l->t('Exclude the following file types from encryption'); ?>
 	</fieldset>
 </form>
--- a/apps/files_external/l10n/da.php
+++ b/apps/files_external/l10n/da.php
@ -5,6 +5,8 @@
 "Fill out all required fields" => "Udfyld alle nødvendige felter",
 "Please provide a valid Dropbox app key and secret." => "Angiv venligst en valid Dropbox app nøgle og hemmelighed",
 "Error configuring Google Drive storage" => "Fejl ved konfiguration af Google Drive plads",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b> Advarsel: </ b> \"smbclient\" ikke er installeret. Montering af CIFS / SMB delinger er ikke muligt. Spørg din systemadministrator om at installere det.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b> Advarsel: </ b> FTP-understøttelse i PHP ikke er aktiveret eller installeret. Montering af FTP delinger er ikke muligt. Spørg din systemadministrator om at installere det.",
 "External Storage" => "Ekstern opbevaring",
 "Mount point" => "Monteringspunkt",
 "Backend" => "Backend",
--- a/apps/files_external/l10n/de.php
+++ b/apps/files_external/l10n/de.php
@ -5,6 +5,8 @@
 "Fill out all required fields" => "Bitte alle notwendigen Felder füllen",
 "Please provide a valid Dropbox app key and secret." => "Bitte trage einen gültigen Dropbox-App-Key mit Secret ein.",
 "Error configuring Google Drive storage" => "Fehler beim Einrichten von 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>Warnung:</b> \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitte Deinen System-Administrator, dies zu installieren.",
+"<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>Warnung::</b> Die FTP Unterstützung  von PHP ist nicht aktiviert oder installiert. Bitte wende Dich an Deinen Systemadministrator.",
 "External Storage" => "Externer Speicher",
 "Mount point" => "Mount-Point",
 "Backend" => "Backend",
--- a/apps/files_external/l10n/de_DE.php
+++ b/apps/files_external/l10n/de_DE.php
@ -5,6 +5,8 @@
 "Fill out all required fields" => "Bitte alle notwendigen Felder füllen",
 "Please provide a valid Dropbox app key and secret." => "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein.",
 "Error configuring Google Drive storage" => "Fehler beim Einrichten von 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>Warnung:</b> \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitten Sie Ihren Systemadministrator, dies zu installieren.",
+"<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>Warnung::</b> Die FTP Unterstützung  von PHP ist nicht aktiviert oder installiert. Bitte wenden Sie sich an Ihren Systemadministrator.",
 "External Storage" => "Externer Speicher",
 "Mount point" => "Mount-Point",
 "Backend" => "Backend",
--- a/apps/files_external/l10n/el.php
+++ b/apps/files_external/l10n/el.php
@ -5,6 +5,8 @@
 "Fill out all required fields" => "Συμπληρώστε όλα τα απαιτούμενα πεδία",
 "Please provide a valid Dropbox app key and secret." => "Παρακαλούμε δώστε έγκυρο κλειδί Dropbox και μυστικό.",
 "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> Ο \"smbclient\" δεν εγκαταστάθηκε. Δεν είναι δυνατή η προσάρτηση 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> Η υποστήριξη FTP στην PHP δεν ενεργοποιήθηκε ή εγκαταστάθηκε. Δεν είναι δυνατή η προσάρτηση FTP. Παρακαλώ ενημερώστε τον διαχειριστή συστήματος να το εγκαταστήσει.",
 "External Storage" => "Εξωτερικό Αποθηκευτικό Μέσο",
 "Mount point" => "Σημείο προσάρτησης",
 "Backend" => "Σύστημα υποστήριξης",
--- a/apps/files_external/l10n/mk.php
+++ b/apps/files_external/l10n/mk.php
@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Backend" => "Админ",
 "Groups" => "Групи",
 "Users" => "Корисници",
 "Delete" => "Избриши"
--- a/apps/files_external/l10n/nl.php
+++ b/apps/files_external/l10n/nl.php
@ -5,6 +5,8 @@
 "Fill out all required fields" => "Vul alle verplichte in",
 "Please provide a valid Dropbox app key and secret." => "Geef een geldige Dropbox key en secret.",
 "Error configuring Google Drive storage" => "Fout tijdens het configureren van Google Drive opslag",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Waarschuwing:</b> \"smbclient\" is niet geïnstalleerd. Mounten van CIFS/SMB shares is niet mogelijk. Vraag uw beheerder om smbclient te installeren.",
+"<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>Waarschuwing:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van FTP shares is niet mogelijk. Vraag uw beheerder FTP ondersteuning te installeren.",
 "External Storage" => "Externe opslag",
 "Mount point" => "Aankoppelpunt",
 "Backend" => "Backend",
--- a/apps/files_external/l10n/pt_PT.php
+++ b/apps/files_external/l10n/pt_PT.php
@ -5,6 +5,8 @@
 "Fill out all required fields" => "Preencha todos os campos obrigatórios",
 "Please provide a valid Dropbox app key and secret." => "Por favor forneça uma \"app key\" e \"secret\" do Dropbox válidas.",
 "Error configuring Google Drive storage" => "Erro ao configurar o armazenamento do Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> O cliente \"smbclient\" não está instalado. Não é possível montar as partilhas CIFS/SMB . Peça ao seu administrador para instalar.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> O suporte FTP no PHP não está activate ou instalado. Não é possível montar as partilhas FTP. Peça ao seu administrador para instalar.",
 "External Storage" => "Armazenamento Externo",
 "Mount point" => "Ponto de montagem",
 "Backend" => "Backend",
--- a/apps/files_external/l10n/ru_RU.php
+++ b/apps/files_external/l10n/ru_RU.php
@ -5,6 +5,8 @@
 "Fill out all required fields" => "Заполните все требуемые поля",
 "Please provide a valid Dropbox app key and secret." => "Пожалуйста представьте допустимый ключ приложения Dropbox и пароль.",
 "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> \"smbclient\" не установлен. Подключение общих папок 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> Поддержка FTP в PHP не включена или не установлена. Подключение по FTP невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить ее.",
 "External Storage" => "Внешние системы хранения данных",
 "Mount point" => "Точка монтирования",
 "Backend" => "Бэкэнд",
--- a/apps/files_external/l10n/sl.php
+++ b/apps/files_external/l10n/sl.php
@ -5,6 +5,8 @@
 "Fill out all required fields" => "Zapolni vsa zahtevana polja",
 "Please provide a valid Dropbox app key and secret." => "Vpišite veljaven ključ programa in kodo za Dropbox",
 "Error configuring Google Drive storage" => "Napaka nastavljanja shrambe 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>Opozorilo:</b> \"smbclient\" ni nameščen. Priklapljanje CIFS/SMB pogonov ni mogoče. Prosimo, prosite vašega skrbnika, če ga namesti.",
+"<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>Opozorilo:</b> FTP podpora v PHP ni omogočena ali nameščena. Priklapljanje FTP pogonov ni mogoče. Prosimo, prosite vašega skrbnika, če jo namesti ali omogoči.",
 "External Storage" => "Zunanja podatkovna shramba",
 "Mount point" => "Priklopna točka",
 "Backend" => "Zaledje",
--- a/apps/files_external/l10n/zh_CN.php
+++ b/apps/files_external/l10n/zh_CN.php
@ -5,6 +5,8 @@
 "Fill out all required fields" => "完成所有必填项",
 "Please provide a valid Dropbox app key and secret." => "请提供有效的Dropbox应用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>“smbclient” 尚未安装。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 分享挂载无法实现。请咨询系统管理员进行安装。",
 "External Storage" => "外部存储",
 "Mount point" => "挂载点",
 "Backend" => "后端",
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@ -331,7 +331,7 @@ class OC_Mount_Config {
 			foreach ($data[self::MOUNT_TYPE_GROUP] as $group => $mounts) {
 				$content .= "\t\t'".$group."' => array (\n";
 				foreach ($mounts as $mountPoint => $mount) {
-					$content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).", \n";
+					$content .= "\t\t\t'".addcslashes($mountPoint,"'")."' => ".str_replace("\n", '', var_export($mount, true)).", \n";

 				}
 				$content .= "\t\t),\n";
@ -343,7 +343,7 @@ class OC_Mount_Config {
 			foreach ($data[self::MOUNT_TYPE_USER] as $user => $mounts) {
 				$content .= "\t\t'".$user."' => array (\n";
 				foreach ($mounts as $mountPoint => $mount) {
-					$content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).",\n";
+					$content .= "\t\t\t'".addcslashes($mountPoint,"'")."' => ".str_replace("\n", '', var_export($mount, true)).",\n";
 				}
 				$content .= "\t\t),\n";
 			}
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@ -20,6 +20,8 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */

+OC_Util::checkAdminUser();
+
 OCP\Util::addScript('files_external', 'settings');
 OCP\Util::addscript('3rdparty', 'chosen/chosen.jquery.min');
 OCP\Util::addStyle('files_external', 'settings');
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@ -127,19 +127,14 @@
 	</fieldset>
 </form>

+<?php if ( ! $_['isAdminPage']):  ?>
 <form id="files_external"
 	  method="post"
 	  enctype="multipart/form-data"
 	  action="<?php echo OCP\Util::linkTo('files_external', 'ajax/addRootCertificate.php'); ?>">
 <fieldset class="personalblock">
-<?php if ( ! $_['isAdminPage']):  ?>
+		<legend><strong><?php echo $l->t('SSL root certificates');?></strong></legend>
 		<table id="sslCertificate" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
-			<thead>
-				<tr>
-					<th><?php echo $l->t('SSL root certificates'); ?></th>
-					<th>&nbsp;</th>
-				</tr>
-			</thead>
 			<tbody width="100%">
 			<?php foreach ($_['certs'] as $rootCert): ?>
 			<tr id="<?php echo $rootCert ?>">
@ -156,6 +151,6 @@
 		</table>
 		<input type="file" id="rootcert_import" name="rootcert_import" style="width:230px;">
 		<input type="submit" name="cert_import" value="<?php echo $l->t('Import Root Certificate'); ?>" />
-		<?php endif; ?>
 </fieldset>
 </form>
+<?php endif; ?>
--- a/apps/files_sharing/l10n/ar.php
+++ b/apps/files_sharing/l10n/ar.php
@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Password" => "كلمة المرور",
+"Submit" => "تطبيق",
+"%s shared the folder %s with you" => "%s شارك المجلد %s معك",
+"%s shared the file %s with you" => "%s شارك الملف %s معك",
+"Download" => "تحميل",
+"No preview available for" => "لا يوجد عرض مسبق لـ",
+"web services under your control" => "خدمات الشبكة تحت سيطرتك"
+);
--- a/apps/files_sharing/l10n/mk.php
+++ b/apps/files_sharing/l10n/mk.php
@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Лозинка",
+"Submit" => "Прати",
+"%s shared the folder %s with you" => "%s ја сподели папката %s со Вас",
+"%s shared the file %s with you" => "%s ја сподели датотеката %s со Вас",
+"Download" => "Преземи",
+"No preview available for" => "Нема достапно преглед за",
+"web services under your control" => "веб сервиси под Ваша контрола"
+);
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@ -10,7 +10,7 @@ OCP\App::registerPersonal('files_versions', 'settings-personal');
 OCP\Util::addscript('files_versions', 'versions');

 // Listen to write signals
-OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA_Versions\Hooks", "write_hook");
+OCP\Util::connectHook('OC_Filesystem', 'write', "OCA_Versions\Hooks", "write_hook");
 // Listen to delete and rename signals
 OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA_Versions\Hooks", "remove_hook");
 OCP\Util::connectHook('OC_Filesystem', 'rename', "OCA_Versions\Hooks", "rename_hook");
--- a/apps/files_versions/l10n/ar.php
+++ b/apps/files_versions/l10n/ar.php
@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "إنهاء تاريخ الإنتهاء لجميع الإصدارات",
+"History" => "السجل الزمني",
+"Versions" => "الإصدارات",
+"This will delete all existing backup versions of your files" => "هذه العملية ستقوم بإلغاء جميع إصدارات النسخ الاحتياطي للملفات",
+"Files Versioning" => "أصدرة الملفات",
+"Enable" => "تفعيل"
+);
--- a/apps/files_versions/l10n/mk.php
+++ b/apps/files_versions/l10n/mk.php
@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Истечи ги сите верзии",
+"History" => "Историја",
+"Versions" => "Версии",
+"This will delete all existing backup versions of your files" => "Ова ќе ги избрише сите постоечки резервни копии од вашите датотеки",
+"Files Versioning" => "Верзии на датотеки",
+"Enable" => "Овозможи"
+);
--- a/apps/files_versions/templates/settings-personal.php
+++ b/apps/files_versions/templates/settings-personal.php
@ -3,12 +3,10 @@
 		<legend>
 			<strong><?php echo $l->t('Versions'); ?></strong>
 		</legend>
-		<p>
-            <?php echo $l->t('This will delete all existing backup versions of your files'); ?>
-        </p>
 		<button id="expireAllBtn">
            <?php echo $l->t('Expire all versions'); ?>
            <img style="display: none;" class="expireAllLoading" src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" />
-        </button>
+            </button>
+            <br /><em><?php echo $l->t('This will delete all existing backup versions of your files'); ?></em>
 	</fieldset>
 </form>
--- a/apps/user_ldap/l10n/ar.php
+++ b/apps/user_ldap/l10n/ar.php
@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Password" => "كلمة المرور"
+);
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Avís:</b> Les aplicacions user_ldap i user_webdavauth són incompatibles. Podeu experimentar comportaments no desitjats. Demaneu a l'administrador del sistema que en desactivi una.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Avís:</b> El mòdul  PHP LDAP necessari no està instal·lat, el dorsal no funcionarà. Demaneu a l'administrador del sistema que l'instal·li.",
 "Host" => "Màquina",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://",
 "Base DN" => "DN Base",
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Varování:</b> Aplikace user_ldap a user_webdavauth nejsou kompatibilní. Může nastávat neočekávané chování. Požádejte, prosím, správce systému aby jednu z nich zakázal.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varování:</b> není nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosím, správce systému aby jej nainstaloval.",
 "Host" => "Počítač",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Můžete vynechat protokol, vyjma pokud požadujete SSL. Tehdy začněte s ldaps://",
 "Base DN" => "Základní DN",
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Das PHP-Modul, das LDAP benöntigt, ist nicht installiert. Das Backend wird nicht funktionieren. Bitte deinen Systemadministrator das Modul zu installieren.",
 "Host" => "Host",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://",
 "Base DN" => "Basis-DN",
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Das PHP-Modul, das LDAP benöntigt, ist nicht installiert. Das Backend wird nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.",
 "Host" => "Host",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Sie können das Protokoll auslassen, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://",
 "Base DN" => "Basis-DN",
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibles.  Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Advertencia:</b> El módulo PHP LDAP necesario no está instalado, el sistema no funcionará. Pregunte al administrador del sistema para instalarlo.",
 "Host" => "Servidor",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://",
 "Base DN" => "DN base",
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Avertissement:</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des disfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Avertissement:</b> Le module PHP LDAP requis n'est pas installé, l'application ne marchera pas. Contactez votre administrateur système pour qu'il l'installe.",
 "Host" => "Hôte",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://",
 "Base DN" => "DN Racine",
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne uno.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Avviso:</b> il modulo PHP LDAP richiesto non è installato, il motore non funzionerà. Chiedi al tuo amministratore di sistema di installarlo.",
 "Host" => "Host",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://",
 "Base DN" => "DN base",
--- a/apps/user_ldap/l10n/ja_JP.php
+++ b/apps/user_ldap/l10n/ja_JP.php
@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>警告:</b> user_ldap と user_webdavauth のアプリには互換性がありません。予期せぬ動作をする可能姓があります。システム管理者にどちらかを無効にするよう問い合わせてください。",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>警告:</b> PHP LDAP モジュールがインストールされていません。バックエンドが正しくどうさしません。システム管理者にインストールするよう問い合わせてください。",
 "Host" => "ホスト",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。",
 "Base DN" => "ベースDN",
--- a/apps/user_ldap/l10n/mk.php
+++ b/apps/user_ldap/l10n/mk.php
@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Лозинка"
+);
--- a/apps/user_ldap/l10n/nl.php
+++ b/apps/user_ldap/l10n/nl.php
@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Waarschuwing:</b> De PHP LDAP module is niet geïnstalleerd, de backend zal dus niet werken. Vraag uw beheerder de module te installeren.",
 "Host" => "Host",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Je kunt het protocol weglaten, tenzij je SSL vereist. Start in dat geval met ldaps://",
 "Base DN" => "Basis DN",
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Ostrzeżenie:</b> Aplikacje user_ldap i user_webdavauth nie są  kompatybilne. Mogą powodować nieoczekiwane zachowanie. Poproś administratora o wyłączenie jednej z nich.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Ostrzeżenie:</b>  Moduł PHP LDAP nie jest zainstalowany i nie będzie działał. Poproś administratora o włączenie go.",
 "Host" => "Host",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://",
 "Base DN" => "Baza DN",
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O módulo PHP LDAP necessário não está instalado, o backend não irá funcionar. Peça ao seu administrador para o instalar.",
 "Host" => "Anfitrião",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://",
 "Base DN" => "DN base",
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Внимание:</b>Приложения user_ldap и user_webdavauth несовместимы. Вы можете столкнуться с неожиданным поведением. Пожалуйста, обратитесь к системному администратору, чтобы отключить одно из них.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Внимание:</b> Необходимый PHP LDAP модуль не установлен, внутренний интерфейс не будет работать. Пожалуйста, обратитесь к системному администратору, чтобы установить его.",
 "Host" => "Сервер",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Можно опустить протокол, за исключением того, когда вам требуется SSL. Тогда начните с ldaps :/ /",
 "Base DN" => "Базовый DN",
--- a/apps/user_ldap/l10n/ru_RU.php
+++ b/apps/user_ldap/l10n/ru_RU.php
@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете столкнуться с неожиданным поведением системы. Пожалуйста, обратитесь к системному администратору для отключения одного из них.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Предупреждение:</b> Необходимый PHP LDAP-модуль не установлен, backend не будет работать. Пожалуйста, обратитесь к системному администратору, чтобы установить его.",
 "Host" => "Хост",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Вы можете пропустить протокол, если Вам не требуется SSL. Затем начните с ldaps://",
 "Base DN" => "База DN",
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Opozorilo:</b> Aplikaciji user_ldap in user_webdavauth nista združljivi. Morda boste opazili nepričakovano obnašanje sistema. Prosimo, prosite vašega skrbnika, da eno od aplikacij onemogoči.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Opozorilo:</b> PHP LDAP modul mora biti nameščen, sicer ta vmesnik ne bo deloval. Prosimo, prosite vašega skrbnika, če ga namesti.",
 "Host" => "Gostitelj",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://",
 "Base DN" => "Osnovni DN",
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Varning:</b> Apps user_ldap och user_webdavauth är inkompatibla. Oväntade problem kan uppstå. Be din systemadministratör att inaktivera en av dom.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varning:</b> PHP LDAP-modulen måste vara installerad, serversidan kommer inte att fungera. Be din systemadministratör att installera den.",
 "Host" => "Server",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du behöver inte ange protokoll förutom om du använder SSL. Starta då med ldaps://",
 "Base DN" => "Start DN",
--- a/apps/user_ldap/l10n/uk.php
+++ b/apps/user_ldap/l10n/uk.php
@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Увага:</b> Застосунки user_ldap та user_webdavauth не сумісні. Ви можете зіткнутися з несподіваною поведінкою. Будь ласка, зверніться до системного адміністратора, щоб відключити одну з них.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Увага:</ b> Потрібний модуль PHP LDAP не встановлено, базова програма працювати не буде. Будь ласка, зверніться до системного адміністратора, щоб встановити його.",
 "Host" => "Хост",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://",
 "Base DN" => "Базовий DN",
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@ -20,6 +20,9 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
+
+OC_Util::checkAdminUser();
+
 $params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_agent_password', 'ldap_base', 'ldap_base_users', 'ldap_base_groups', 'ldap_userlist_filter', 'ldap_login_filter', 'ldap_group_filter', 'ldap_display_name', 'ldap_group_display_name', 'ldap_tls', 'ldap_turn_off_cert_check', 'ldap_nocase', 'ldap_quota_def', 'ldap_quota_attr', 'ldap_email_attr', 'ldap_group_member_assoc_attribute', 'ldap_cache_ttl', 'home_folder_naming_rule');

 OCP\Util::addscript('user_ldap', 'settings');
--- a/apps/user_webdavauth/l10n/ar.php
+++ b/apps/user_webdavauth/l10n/ar.php
@ -1,3 +1,3 @@
 <?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"URL: http://" => "الرابط: http://"
 );
--- a/apps/user_webdavauth/l10n/ca.php
+++ b/apps/user_webdavauth/l10n/ca.php
@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "Adreça WebDAV: http://"
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud enviarà les credencials d'usuari a aquesta URL. S'interpretarà http 401 i http 403 com a credencials incorrectes i tots els altres codis com a credencials correctes."
 );
--- a/apps/user_webdavauth/l10n/cs_CZ.php
+++ b/apps/user_webdavauth/l10n/cs_CZ.php
@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "URL WebDAV: http://"
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud odešle přihlašovací údaje uživatele na URL a z návratové hodnoty určí stav přihlášení. Http 401 a 403 vyhodnotí jako neplatné údaje a všechny ostatní jako úspěšné přihlášení."
 );
--- a/apps/user_webdavauth/l10n/da.php
+++ b/apps/user_webdavauth/l10n/da.php
@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud vil sende brugeroplysningerne til denne webadresse er fortolker http 401 og http 403 som brugeroplysninger forkerte og alle andre koder som brugeroplysninger korrekte."
+);
--- a/apps/user_webdavauth/l10n/de.php
+++ b/apps/user_webdavauth/l10n/de.php
@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud wird die Logindaten zu dieser URL senden. http 401 und http 403 werden als falsche Logindaten interpretiert und alle anderen Codes als korrekte Logindaten."
 );
--- a/apps/user_webdavauth/l10n/de_DE.php
+++ b/apps/user_webdavauth/l10n/de_DE.php
@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud "
 );
--- a/apps/user_webdavauth/l10n/el.php
+++ b/apps/user_webdavauth/l10n/el.php
@ -1,3 +1,3 @@
 <?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"URL: http://" => "URL: http://"
 );
--- a/apps/user_webdavauth/l10n/it.php
+++ b/apps/user_webdavauth/l10n/it.php
@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "URL WebDAV: http://"
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud invierà le credenziali dell'utente a questo URL. Interpreta i codici http 401 e http 403 come credenziali errate e tutti gli altri codici come credenziali corrette."
 );
--- a/apps/user_webdavauth/l10n/ja_JP.php
+++ b/apps/user_webdavauth/l10n/ja_JP.php
@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloudのこのURLへのユーザ資格情報の送信は、資格情報が間違っている場合はHTTP401もしくは403を返し、正しい場合は全てのコードを返します。"
 );
--- a/apps/user_webdavauth/l10n/nl.php
+++ b/apps/user_webdavauth/l10n/nl.php
@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud zal de inloggegevens naar deze URL als geïnterpreteerde http 401 en http 403 als de inloggegevens onjuist zijn. Andere codes als de inloggegevens correct zijn."
 );
--- a/apps/user_webdavauth/l10n/pl.php
+++ b/apps/user_webdavauth/l10n/pl.php
@ -1,3 +1,3 @@
 <?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"URL: http://" => "URL: http://"
 );
--- a/apps/user_webdavauth/l10n/pt_PT.php
+++ b/apps/user_webdavauth/l10n/pt_PT.php
@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "Endereço WebDAV: http://"
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "O ownCloud vai enviar as credenciais para este URL. Todos os códigos http 401 e 403 serão interpretados como credenciais inválidas, todos os restantes códigos http serão interpretados como credenciais correctas."
 );
--- a/apps/user_webdavauth/l10n/ru_RU.php
+++ b/apps/user_webdavauth/l10n/ru_RU.php
@ -1,3 +1,3 @@
 <?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"URL: http://" => "URL: http://"
 );
--- a/apps/user_webdavauth/l10n/sv.php
+++ b/apps/user_webdavauth/l10n/sv.php
@ -1,3 +1,3 @@
 <?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"URL: http://" => "URL: http://"
 );
--- a/apps/user_webdavauth/l10n/uk.php
+++ b/apps/user_webdavauth/l10n/uk.php
@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud відправить облікові дані на цей URL та буде інтерпретувати http 401 і http 403, як невірні облікові дані, а всі інші коди, як вірні."
 );
--- a/apps/user_webdavauth/l10n/zh_CN.php
+++ b/apps/user_webdavauth/l10n/zh_CN.php
@ -1,3 +1,3 @@
 <?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV地址: http://"
+"URL: http://" => "URL：http://"
 );
--- a/apps/user_webdavauth/settings.php
+++ b/apps/user_webdavauth/settings.php
@ -21,6 +21,8 @@
 *
 */

+OC_Util::checkAdminUser();
+
 if($_POST) {

 	if(isset($_POST['webdav_url'])) {
--- a/apps/user_webdavauth/templates/settings.php
+++ b/apps/user_webdavauth/templates/settings.php
@ -1,7 +1,8 @@
 <form id="webdavauth" action="#" method="post">
 	<fieldset class="personalblock">
 		<legend><strong>WebDAV Authentication</strong></legend>
-		<p><label for="webdav_url"><?php echo $l->t('WebDAV URL: http://');?><input type="text" id="webdav_url" name="webdav_url" value="<?php echo $_['webdav_url']; ?>"></label>
+		<p><label for="webdav_url"><?php echo $l->t('URL: http://');?><input type="text" id="webdav_url" name="webdav_url" value="<?php echo $_['webdav_url']; ?>"></label>
 		<input type="submit" value="Save" />
+		<br /><?php echo $l->t('ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct.'); ?>
 	</fieldset>
 </form>
--- a/build/README.TXT
+++ b/build/README.TXT
@ -0,0 +1,28 @@
+How to setup build.xml on your local machine?
+
+1.) Install ant
+ e.g. apt-get install ant
+
+2.) Install jslint
+ Get the latest distribution from http://code.google.com/p/jslint4java/ and 
+ place jslint4java-*.jar in your home under .ant/lib/
+
+3.) Install PHP qa tools
+ Run as root:
+  pear config-set auto_discover 1
+  pear install pear.phpqatools.org/phpqatools pear.netpirates.net/phpDox
+
+ Alternative:
+  pear install pear.phpunit.de/phploc
+  pear install pear.phpunit.de/phpcpd
+  pear install pear.phpmd.org/PHP_PMD
+  pear install pear.pdepend.org/PHP_Depend
+  pear install pear.php.org/PHP_CodeSniffer
+  pear install PHP_CodeSniffer
+  pear install pear.phpqatools.org/PHP_CodeBrowser
+
+
+How to call this ant script?
+ ant -f  build/build.xml -Dbasedir=. 
+
+
--- a/build/build.xml
+++ b/build/build.xml
@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="ownCloud" default="build" xmlns:jsl="antlib:com.googlecode.jslint4java">
+
+ <!-- the target 'build' can be used by developers for command line builds -->
+ <target name="build" depends="prepare,lint,jslint,phploc,pdepend,phpmd,phpcs,phpcpd,phpdoc,phpunit"/>
+
+ <!-- the target 'build-ci' is used within our Jenkins CI-server http://ci.tmit.eu -->
+ <target name="build-ci" depends="prepare,lint,jslint-ci,phploc,pdepend,phpmd-ci,phpcs-ci,phpcpd-ci,phpdoc,phpunit,phpcb-ci"/>
+
+ <!-- the target 'build-pullrequests' is used within our Jenkins CI-server for pull request analysis -->
+ <target name="build-pullrequests" depends="prepare,lint,jslint-ci"/>
+
+ <target name="clean" description="Cleanup build artifacts">
+  <delete dir="${basedir}/build/api"/>
+  <delete dir="${basedir}/build/code-browser"/>
+  <delete dir="${basedir}/build/coverage"/>
+  <delete dir="${basedir}/build/logs"/>
+  <delete dir="${basedir}/build/pdepend"/>
+ </target>
+
+ <target name="prepare" depends="clean"
+         description="Prepare for build">
+  <mkdir dir="${basedir}/build/api"/>
+  <mkdir dir="${basedir}/build/code-browser"/>
+  <mkdir dir="${basedir}/build/coverage"/>
+  <mkdir dir="${basedir}/build/logs"/>
+  <mkdir dir="${basedir}/build/pdepend"/>
+ </target>
+
+ <!-- php syntax analysis -->
+ <target name="lint">
+  <apply executable="php" failonerror="true">
+   <arg value="-l" />
+
+   <fileset dir="${basedir}">
+    <include name="**/*.php" />
+    <exclude name="**/3rdparty/**" />
+    <exclude name="**/l10n/**" />
+    <!-- modified / -->
+   </fileset>
+
+  </apply>
+ </target>
+
+ <!-- javascript lint -->
+ <target name="jslint-ci" description="Run the JSLint tool on JS files">
+  <jsl:jslint options="white,sloppy,vars,bitwise,eqeq,browser" haltOnFailure="false">
+   <jsl:predef>
+jQuery,$$,OC,$,oc_webroot,oc_appswebroots,oc_current_user,t,Files,FileList,FileActions,localStorage,OCCategories,EventSource,OCdialog,SVGSupport,dragOptions,dragOptions,folderDropOptions,formatDate,humanFileSize,procesSelection,relative_modified_date,scanFiles,simpleFileSize,simpleSize
+</jsl:predef>
+   <!-- jsl:formatter type="plain" / -->
+   <jsl:formatter type="xml" destfile="build/logs/jslint.xml" />
+   <fileset dir="${basedir}" includes="**/*.js" excludes="**/*.min.js,**/3rdparty/**" />
+  </jsl:jslint>
+ </target>
+
+ <target name="jslint" description="Run the JSLint tool on JS files">
+  <jsl:jslint options="white,sloppy,vars,bitwise,eqeq,browser" haltOnFailure="false">
+   <jsl:predef>
+jQuery,$$,OC,$,oc_webroot,oc_appswebroots,oc_current_user,t,Files,FileList,FileActions,localStorage,OCCategories,EventSource,OCdialog,SVGSupport,dragOptions,dragOptions,folderDropOptions,formatDate,humanFileSize,procesSelection,relative_modified_date,scanFiles,simpleFileSize,simpleSize
+</jsl:predef>
+   <jsl:formatter type="plain" />
+   <fileset dir="${basedir}" includes="**/*.js" excludes="**/*.min.js,**/3rdparty/**" />
+  </jsl:jslint>
+ </target>
+
+ <target name="phploc" description="Measure project size using PHPLOC">
+  <exec executable="phploc">
+   <arg value="--log-csv" />
+   <arg value="${basedir}/build/logs/phploc.csv" />
+   <arg path="${basedir}" />
+   <arg value="--exclude" />
+   <arg value="${basedir}/3rdparty/" />
+  </exec>
+ </target>
+
+ <target name="pdepend"
+         description="Calculate software metrics using PHP_Depend">
+  <exec executable="pdepend">
+   <arg value="--jdepend-xml=${basedir}/build/logs/jdepend.xml" />
+   <arg value="--jdepend-chart=${basedir}/build/pdepend/dependencies.svg" />
+   <arg value="--overview-pyramid=${basedir}/build/pdepend/overview-pyramid.svg" />
+   <arg value="--ignore=${basedir}/3rdparty/"/>
+   <arg path="${basedir}" />
+  </exec>
+ </target>
+
+ <target name="phpmd-ci"
+         description="Perform project mess detection using PHPMD creating a log file for the continuous integration server">
+  <exec executable="phpmd">
+   <arg path="${basedir}" />
+   <arg value="xml" />
+   <arg value="${basedir}/build/phpmd.xml" />
+   <arg value="--reportfile" />
+   <arg value="${basedir}/build/logs/pmd.xml" />
+   <arg value="--exclude" />
+   <arg value="${basedir}/3rdparty/" />
+  </exec>
+ </target>
+
+ <target name="phpmd"
+         description="Perform project mess detection using PHPMD creating a log file for the continuous integration server">
+  <exec executable="phpmd">
+   <arg path="${basedir}" />
+   <arg value="xml" />
+   <arg value="${basedir}/build/phpmd.xml" />
+   <arg value="--exclude" />
+   <arg value="${basedir}/3rdparty/" />
+  </exec>
+ </target>
+
+ <target name="phpcs-ci"
+         description="Find coding standard violations using PHP_CodeSniffer creating a log file for the continuous integration server">
+  <exec executable="phpcs" >
+   <arg value="-p" />
+   <arg value="-v" />
+   <arg value="--tab-width=4" />
+   <arg value="--report=checkstyle" />
+   <arg value="--report-file=${basedir}/build/logs/checkstyle.xml" />
+   <arg value="--standard=${basedir}/build/phpcs.xml" />
+   <arg path="${basedir}" />
+  </exec>
+ </target>
+
+ <target name="phpcs"
+         description="Find coding standard violations using PHP_CodeSniffer creating a log file for the continuous integration server">
+  <exec executable="phpcs" >
+   <arg value="-p" />
+   <arg value="-v" />
+   <arg value="--tab-width=4" />
+   <arg value="--standard=${basedir}/build/phpcs.xml" />
+   <arg path="${basedir}" />
+  </exec>
+ </target>
+
+ <target name="phpcpd" description="Find duplicate code using PHPCPD">
+  <exec executable="phpcpd">
+   <arg value="--exclude" />
+   <arg value="${basedir}/3rdparty/" />
+   <arg path="${basedir}" />
+  </exec>
+ </target>
+
+ <target name="phpcpd-ci" description="Find duplicate code using PHPCPD">
+  <exec executable="phpcpd">
+   <arg value="--log-pmd" />
+   <arg value="${basedir}/build/logs/pmd-cpd.xml" />
+   <arg value="--exclude" />
+   <arg value="${basedir}/3rdparty/" />
+   <arg path="${basedir}" />
+  </exec>
+ </target>
+
+ <!-- No idea if we need this within this build file. This is part of the release which is not contained within this script. -->
+ <target name="phpdoc"
+         description="Generate API documentation using PHPDocumentor">
+  <!-- exec executable="phpdox"/ -->
+ </target>
+
+ <!-- currently we use autotest.sh for executing the unit tests against 3 different database setups -->
+ <target name="phpunit" description="Run unit tests with PHPUnit">
+  <echo message="TODO: phpunit goes here"/>
+  <!-- exec executable="phpunit" failonerror="true"/ -->
+ </target>
+
+ <target name="phpcb-ci"
+         description="Aggregate tool output with PHP_CodeBrowser">
+  <exec executable="phpcb">
+   <arg value="--log" />
+   <arg path="${basedir}/build/logs" />
+   <arg value="--source" />
+   <arg path="${basedir}" />
+   <arg value="--output" />
+   <arg path="${basedir}/build/code-browser" />
+   <arg value="--exclude" />
+   <arg value="${basedir}/3rdparty/" />
+  </exec>
+ </target>
+</project>
--- a/build/phpcs.xml
+++ b/build/phpcs.xml
@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<ruleset name="PHP_CodeSniffer">
+ <description>The coding standard for PHP_CodeSniffer itself.</description>
+ <exclude-pattern>*/Tests/*</exclude-pattern>
+ <exclude-pattern>*/lib/MDB2/*</exclude-pattern>
+ <exclude-pattern>*/3rdparty/*</exclude-pattern>
+ <exclude-pattern>*.min.*</exclude-pattern>
+ <exclude-pattern>*/l10n/*</exclude-pattern>
+ <exclude-pattern>*/files_texteditor/js/aceeditor/*</exclude-pattern>
+ <exclude-pattern>*/files_pdfviewer/js/pdfjs/*</exclude-pattern>
+ <exclude-pattern>*/files_odfviewer/src/*</exclude-pattern>
+ <exclude-pattern>*/files_svgedit/svg-edit/*</exclude-pattern>
+ <exclude-pattern>*jquery-ui-1.8.16.custom.css</exclude-pattern>
+ <extensions>php</extensions>
+
+ <!-- Include the whole PEAR standard -->
+ <rule ref="PEAR">
+  <exclude name="PEAR.Commenting.FileComment.InvalidAuthors" />
+  <exclude name="PEAR.Commenting.FileComment.TagIndent" />
+  <exclude name="PEAR.Commenting.FileComment.MissingVersion" />
+  <exclude name="PEAR.Commenting.FileComment.MissingTag" />
+  <exclude name="PEAR.Commenting.ClassComment.TagIndent" />
+  <!-- exclude name="PEAR.WhiteSpace.ScopeIndent.Incorrect" /-->
+  <exclude name="PEAR.Commenting.ClassComment.WrongTagOrder" />
+  <exclude name="Generic.WhiteSpace.DisallowTabIndent.TabsUsed" />
+  <exclude name="PEAR.Functions.FunctionCallSignature.SpaceBeforeOpenBracket" />
+  <exclude name="PEAR.Functions.FunctionCallSignature.SpaceAfterOpenBracket" />
+  <exclude name="Generic.ControlStructures.InlineControlStructure.Discouraged" />
+  <exclude name="PEAR.Commenting.FunctionComment.ParameterCommentsNotAligned" />
+  <exclude name="PEAR.Commenting.FunctionComment.MissingParamTag" />
+  <exclude name="PEAR.ControlStructures.ControlSignature" />
+
+  <!-- ident and alignment stuff  -->
+  <!-- exclude name="PEAR.ControlStructures.MultiLineCondition.Alignment" />
+  <exclude name="PEAR.WhiteSpace.ScopeClosingBrace.BreakIdent" / -->
+
+  <!-- allow curly on classes and functions -->
+  <exclude name="PEAR.Functions.FunctionDeclaration.BraceOnSameLine" />
+  <exclude name="PEAR.Classes.ClassDeclaration.OpenBraceNewLine" />
+
+  <exclude name="PEAR.NamingConventions.ValidFunctionName.PrivateNoUnderscore" />
+  <exclude name="PEAR.NamingConventions.ValidVariableName.PrivateNoUnderscore" />
+  <exclude name="PEAR.WhiteSpace.ScopeIndent"/>
+ </rule>
+
+ <rule ref="Zend.Files.ClosingTag" />
+
+ <rule ref="Generic.WhiteSpace.ScopeIndent">
+   <properties>
+     <property name="indent" value="4"/>
+   </properties>
+ </rule>
+
+ <rule ref="Generic.Files.LineLength">
+  <properties>
+   <property name="lineLimit" value="120"/>
+   <property name="absoluteLineLimit" value="160"/>
+  </properties>
+ </rule>
+
+ <!-- Include most of the Squiz standard -->
+ <!-- rule ref="Squiz">
+  <exclude name="Squiz.Classes.ClassFileName"/>
+  <exclude name="Squiz.Classes.ValidClassName"/>
+  <exclude name="Squiz.Commenting.ClassComment"/>
+  <exclude name="Squiz.Commenting.FileComment"/>
+  <exclude name="Squiz.Commenting.FunctionComment"/>
+  <exclude name="Squiz.Commenting.VariableComment"/>
+  <exclude name="Squiz.ControlStructures.SwitchDeclaration"/>
+  <exclude name="Squiz.Files.FileExtension"/>
+  <exclude name="Squiz.NamingConventions.ConstantCase"/>
+  <exclude name="Squiz.Operators.ComparisonOperatorUsage"/>
+</rule -->
+
+ <!-- We allow variables to be used inside double quoted strings -->
+ <!-- rule ref="Squiz.Strings.DoubleQuoteUsage.ContainsVar">
+  <severity>0</severity>
+ </rule -->
+
+</ruleset>
--- a/build/phpmd.xml
+++ b/build/phpmd.xml
@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+ <ruleset name="My first PHPMD rule set" xmlns="http://pmd.sf.net/ruleset/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd" xsi:noNamespaceSchemaLocation=" http://pmd.sf.net/ruleset_xml_schema.xsd">
+ <description> My custom rule set that checks my code... </description>
+ <!-- Import the entire unused code rule set -->
+ <rule ref="rulesets/unusedcode.xml" />
+
+ <!-- Import the entire cyclomatic complexity rule -->
+ <rule ref="rulesets/codesize.xml/CyclomaticComplexity" /> 
+</ruleset>
--- a/config/config.sample.php
+++ b/config/config.sample.php
@ -42,6 +42,12 @@ $CONFIG = array(
 /* Time in seconds how long an user is authenticated without entering his password again before performing sensitive actions like creating or deleting users etc...*/
 "enhancedauthtime" => 15 * 60,

+/* A proxy to use to connect to the internet. For example "myproxy.org:88" */
+"proxy" => "",
+
+/* The optional authentication for the proxy to use to connect to the internet. The format is: [username]:[password] */
+"proxyuserpwd" => "",
+
 /* Theme to use for ownCloud */
 "theme" => "",

--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@ -89,12 +89,8 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 			if ($type === 'dir')
 				$text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s', array($user, $file, $link));

-			// handle localhost installations
-			$server_host = OCP\Util::getServerHost();
-			if ($server_host === 'localhost')
-				$server_host = "example.com";

-			$default_from = 'sharing-noreply@' . $server_host;
+			$default_from = OCP\Util::getDefaultEmailAddress('sharing-noreply');
 			$from_address = OCP\Config::getUserValue($user, 'settings', 'email', $default_from );

 			// send it out now
--- a/core/css/styles.css
+++ b/core/css/styles.css
@ -193,13 +193,11 @@ fieldset.warning legend { color:#b94a48 !important; }
 #notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
 #notification span { cursor:pointer; font-weight:bold; margin-left:1em; }

-tr .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; -webkit-transition:opacity 200ms; -moz-transition:opacity 200ms; -o-transition:opacity 200ms; transition:opacity 200ms; }
+tr .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; }
 tr:hover .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; }
 tr .action { width:16px; height:16px; }
 .header-action { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
 tr:hover .action:hover, .selectedActions a:hover, .header-action:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
-
-table:not(.nostyle) tr { -webkit-transition:background-color 200ms; -moz-transition:background-color 200ms; -o-transition:background-color 200ms; transition:background-color 200ms; }
 tbody tr:hover, tr:active { background-color:#f8f8f8; }

 #body-settings .personalblock, #body-settings .helpblock { padding:.5em 1em; margin:1em; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
--- a/core/doc/admin/index.php
+++ b/core/doc/admin/index.php
@ -0,0 +1,2 @@
+Here goes the admin documentation.
+In the meantime go to <a href="http://owncloud.org/support/" target="_blank">ownCloud.org/support</a>
--- a/core/doc/user/index.php
+++ b/core/doc/user/index.php
@ -0,0 +1,2 @@
+Here goes the user documentation
+In the meantime go to <a href="http://owncloud.org/support/" target="_blank">ownCloud.org/support</a>
--- a/core/img/actions/logout.png
+++ b/core/img/actions/logout.png
--- a/core/img/actions/logout.svg
+++ b/core/img/actions/logout.svg
@ -11,11 +11,14 @@
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   version="1.0"
-   width="18"
+   width="16"
   height="16"
   id="svg2403"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="system-shutdown-panel2.svg">
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="logout.svg"
+   inkscape:export-filename="logout.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
  <sodipodi:namedview
     pagecolor="#ffffff"
     bordercolor="#666666"
@ -26,14 +29,14 @@
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="1280"
-     inkscape:window-height="776"
+     inkscape:window-height="745"
     id="namedview3047"
     showgrid="false"
-     inkscape:zoom="17.875"
-     inkscape:cx="9"
-     inkscape:cy="8"
+     inkscape:zoom="25.279067"
+     inkscape:cx="5.0341304"
+     inkscape:cy="6.4537904"
     inkscape:window-x="0"
-     inkscape:window-y="24"
+     inkscape:window-y="27"
     inkscape:window-maximized="1"
     inkscape:current-layer="svg2403" />
  <metadata
@ -67,7 +70,7 @@
       id="linearGradient2395"
       xlink:href="#linearGradient3678"
       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0526316,0,0,0.9843625,0.5789474,0.06024281)" />
+       gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)" />
    <linearGradient
       id="linearGradient3678">
      <stop
@ -79,17 +82,96 @@
         style="stop-color:#e6e6e6;stop-opacity:1"
         offset="1" />
    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3678"
+       id="linearGradient3879"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)"
+       x1="8.4964771"
+       y1="-0.061573759"
+       x2="8.4964771"
+       y2="8.083209" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3678"
+       id="linearGradient3908"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.0000001,1.1920928e-8)"
+       x1="11.644068"
+       y1="2.4988678"
+       x2="11.644068"
+       y2="15.00281" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3678"
+       id="linearGradient3914"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)"
+       x1="8.4964771"
+       y1="-0.061573759"
+       x2="8.4964771"
+       y2="8.083209" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3678"
+       id="linearGradient3916"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.0000001,1.1920928e-8)"
+       x1="11.644068"
+       y1="2.4988678"
+       x2="11.644068"
+       y2="15.00281" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3678"
+       id="linearGradient3919"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.0000001,1.1920928e-8)"
+       x1="11.644068"
+       y1="2.4988678"
+       x2="11.644068"
+       y2="15.00281" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3678"
+       id="linearGradient3922"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)"
+       x1="8.4964771"
+       y1="-0.061573759"
+       x2="8.4964771"
+       y2="8.083209" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3678"
+       id="linearGradient3925"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)"
+       x1="8.4964771"
+       y1="-0.061573759"
+       x2="8.4964771"
+       y2="15.216674" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3678"
+       id="linearGradient3942"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0526316,0,0,0.9843625,-0.42098964,0.06024281)"
+       x1="8.4964771"
+       y1="-0.061573759"
+       x2="8.4964771"
+       y2="15.216674" />
  </defs>
  <path
-     d="M 5.8427514,4.45 C 0.60889,7.192151 2.9756281,15.05 8.959192,15.05 c 5.921233,0 8.575036,-7.449605 3.11644,-10.6 M 9,8 9,1.9996319"
-     id="path3341-5"
-     style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+     id="path3927"
+     d="m 8.0000634,1 c -0.4714045,0 -0.9610304,0.5419023 -0.95,1 l 0,6 c -0.00747,0.5283126 0.4216346,1 0.95,1 0.5283654,0 0.957472,-0.4716874 0.95,-1 l 0,-6 c 0.014622,-0.605105 -0.4785955,-1 -0.95,-1 z m -3.34375,2.5 c -0.087186,0.019294 -0.1716251,0.050959 -0.25,0.09375 -2.9994999,1.5715133 -3.91842874,4.7978566 -3.125,7.46875 C 2.0747421,13.733393 4.5611725,16 7.9688134,16 11.327833,16 13.846204,13.850562 14.687563,11.21875 15.528922,8.5869378 14.630363,5.3955638 11.562563,3.625 11.128957,3.3713639 10.503661,3.535122 10.250038,3.9687356 9.9964154,4.4023491 10.160192,5.0276401 10.593813,5.28125 c 2.390793,1.3798311 2.882452,3.4944109 2.28125,5.375 -0.601202,1.880589 -2.344037,3.4375 -4.9062496,3.4375 -2.575923,0 -4.297634,-1.650181 -4.875,-3.59375 C 2.5164474,8.5564313 3.0469519,6.451888 5.2813134,5.28125 5.6599659,5.0748887 5.8603711,4.5887067 5.7371222,4.1754605 5.6138734,3.7622144 5.1798937,3.4652349 4.7500634,3.5 4.7188384,3.49846 4.6875384,3.49846 4.6563134,3.5 z"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="sccsccsccssscscssscscc" />
  <path
-     d="M 9,7 9,0.99963191"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3942);fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     d="m 8.0000634,0 c -0.4714045,0 -1.0110304,0.54190231 -1,1 l 0,6 c -0.00747,0.5283126 0.4716346,1 1,1 0.5283654,0 1.007472,-0.4716874 1,-1 l 0,-6 c 0.014622,-0.60510499 -0.5285955,-1 -1,-1 z m -3.34375,2.5 a 0.95009499,0.95009499 0 0 0 -0.25,0.09375 C 1.4068135,4.1652633 0.48788466,7.3916066 1.2813134,10.0625 2.0747421,12.733393 4.5611725,15 7.9688134,15 c 3.3590196,0 5.8773906,-2.149438 6.7187496,-4.78125 0.841359,-2.6318122 -0.0572,-5.8231862 -3.125,-7.59375 a 0.95938009,0.95938009 0 1 0 -0.96875,1.65625 c 2.390793,1.3798311 2.882452,3.4944109 2.28125,5.375 -0.601202,1.880589 -2.344037,3.4375 -4.9062496,3.4375 -2.575923,0 -4.297634,-1.650181 -4.875,-3.59375 -0.577366,-1.9435687 -0.046862,-4.048112 2.1875,-5.21875 A 0.95009499,0.95009499 0 0 0 4.7500634,2.5 a 0.95009499,0.95009499 0 0 0 -0.09375,0 z"
     id="path3716"
-     style="fill:none;stroke:url(#linearGradient2395);stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     d="M 5.8427514,3.45 C 0.60889,6.1921513 2.9756281,14.05 8.959192,14.05 c 5.921233,0 8.575036,-7.4496051 3.11644,-10.6"
-     id="path3341"
-     style="fill:none;stroke:url(#linearGradient2392);stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+     inkscape:connector-curvature="0" />
 </svg>
--- a/core/js/share.js
+++ b/core/js/share.js
@ -161,9 +161,9 @@ OC.Share={
 			if (link) {
 				html += '<div id="link">';
 				html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">'+t('core', 'Share with link')+'</label>';
-				html += '<a href="#" id="showPassword" style="display:none;"><img class="svg" alt="'+t('core', 'Password protect')+'" src="'+OC.imagePath('core', 'actions/lock')+'"/></a>';
 				html += '<br />';
 				html += '<input id="linkText" type="text" readonly="readonly" />';
+				html += '<input type="checkbox" name="showPassword" id="showPassword" value="1" style="display:none;" /><label for="showPassword" style="display:none;">'+t('core', 'Password protect')+'</label>';
 				html += '<div id="linkPass">';
 				html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
 				html += '</div>';
@ -347,9 +347,12 @@ OC.Share={
 		}
 		$('#linkText').val(link);
 		$('#linkText').show('blind');
+		$('#linkText').css('display','block');
 		$('#showPassword').show();
+		$('#showPassword+label').show();
 		if (password != null) {
 			$('#linkPass').show('blind');
+			$('#showPassword').attr('checked', true);
 			$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
 		}
 		$('#expiration').show();
@ -359,6 +362,7 @@ OC.Share={
 	hideLink:function() {
 		$('#linkText').hide('blind');
 		$('#showPassword').hide();
+		$('#showPassword+label').hide();
 		$('#linkPass').hide();
        $('#emailPrivateLink #email').hide();
        $('#emailPrivateLink #emailButton').hide();
@ -518,16 +522,25 @@ $(document).ready(function() {

 	$('#showPassword').live('click', function() {
 		$('#linkPass').toggle('blind');
+		if (!$('#showPassword').is(':checked') ) {
+			var itemType = $('#dropdown').data('item-type');
+			var itemSource = $('#dropdown').data('item-source');
+			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ);
+		} else {
+			$('#linkPassText').focus();
+		}
 	});

-	$('#linkPassText').live('focusout', function(event) {
-		var itemType = $('#dropdown').data('item-type');
-		var itemSource = $('#dropdown').data('item-source');
-		OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() {
-			$('#linkPassText').val('');
-			$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
-		});
-		$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
+	$('#linkPassText').live('focusout keyup', function(event) {
+		if ( $('#linkPassText').val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) {
+			var itemType = $('#dropdown').data('item-type');
+			var itemSource = $('#dropdown').data('item-source');
+			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), OC.PERMISSION_READ, function() {
+				console.log("password set to: '" + $('#linkPassText').val() +"' by event: " + event.type);
+				$('#linkPassText').val('');
+				$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
+			});
+		}
 	});

 	$('#expirationCheckbox').live('click', function() {
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@ -1,10 +1,48 @@
 <?php $TRANSLATIONS = array(
+"No category to add?" => "ألا توجد فئة للإضافة؟",
+"This category already exists: " => "هذه الفئة موجودة مسبقاً",
+"No categories selected for deletion." => "لم يتم اختيار فئة للحذف",
 "Settings" => "تعديلات",
+"seconds ago" => "منذ ثواني",
+"1 minute ago" => "منذ دقيقة",
+"{minutes} minutes ago" => "{minutes} منذ دقائق",
+"today" => "اليوم",
+"Choose" => "اختيار",
 "Cancel" => "الغاء",
+"No" => "لا",
+"Yes" => "نعم",
+"Ok" => "موافق",
+"Error" => "خطأ",
+"Error while sharing" => "حصل خطأ عند عملية المشاركة",
+"Error while unsharing" => "حصل خطأ عند عملية إزالة المشاركة",
+"Error while changing permissions" => "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل",
+"Shared with you and the group {group} by {owner}" => "شورك معك ومع المجموعة {group} من قبل {owner}",
+"Shared with you by {owner}" => "شورك معك من قبل {owner}",
+"Share with" => "شارك مع",
+"Share with link" => "شارك مع رابط",
+"Password protect" => "حماية كلمة السر",
 "Password" => "كلمة السر",
+"Set expiration date" => "تعيين تاريخ إنتهاء الصلاحية",
+"Expiration date" => "تاريخ إنتهاء الصلاحية",
+"Share via email:" => "مشاركة عبر البريد الإلكتروني:",
+"No people found" => "لم يتم العثور على أي شخص",
+"Resharing is not allowed" => "لا يسمح بعملية إعادة المشاركة",
+"Shared in {item} with {user}" => "شورك في {item} مع {user}",
 "Unshare" => "إلغاء مشاركة",
+"can edit" => "التحرير مسموح",
+"access control" => "ضبط الوصول",
+"create" => "إنشاء",
+"update" => "تحديث",
+"delete" => "حذف",
+"share" => "مشاركة",
+"Password protected" => "محمي بكلمة السر",
+"Error unsetting expiration date" => "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية",
+"Error setting expiration date" => "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية",
+"ownCloud password reset" => "إعادة تعيين كلمة سر ownCloud",
 "Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
 "You will receive a link to reset your password via Email." => "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
+"Reset email send." => "إعادة إرسال البريد الإلكتروني.",
+"Request failed!" => "فشل الطلب",
 "Username" => "إسم المستخدم",
 "Request reset" => "طلب تعديل",
 "Your password was reset" => "لقد تم تعديل كلمة السر",
@ -16,9 +54,12 @@
 "Apps" => "التطبيقات",
 "Admin" => "مستخدم رئيسي",
 "Help" => "المساعدة",
+"Access forbidden" => "التوصّل محظور",
 "Cloud not found" => "لم يتم إيجاد",
 "Edit categories" => "عدل الفئات",
 "Add" => "أدخل",
+"Security Warning" => "تحذير أمان",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "لا يوجد مولّد أرقام عشوائية ، الرجاء تفعيل الـ PHP OpenSSL extension.",
 "Create an <strong>admin account</strong>" => "أضف </strong>مستخدم رئيسي <strong>",
 "Advanced" => "خيارات متقدمة",
 "Data folder" => "مجلد المعلومات",
@ -27,6 +68,7 @@
 "Database user" => "مستخدم قاعدة البيانات",
 "Database password" => "كلمة سر مستخدم قاعدة البيانات",
 "Database name" => "إسم قاعدة البيانات",
+"Database tablespace" => "مساحة جدول قاعدة البيانات",
 "Database host" => "خادم قاعدة البيانات",
 "Finish setup" => "انهاء التعديلات",
 "Sunday" => "الاحد",
@ -50,10 +92,16 @@
 "December" => "كانون الاول",
 "web services under your control" => "خدمات الوب تحت تصرفك",
 "Log out" => "الخروج",
+"Automatic logon rejected!" => "تم رفض تسجيل الدخول التلقائي!",
+"If you did not change your password recently, your account may be compromised!" => "قد يكون حسابك في خطر إن لم تقم بإعادة تعيين كلمة السر حديثاً",
+"Please change your password to secure your account again." => "الرجاء إعادة تعيين كلمة السر لتأمين حسابك.",
 "Lost your password?" => "هل نسيت كلمة السر؟",
 "remember" => "تذكر",
 "Log in" => "أدخل",
 "You are logged out." => "تم الخروج بنجاح.",
 "prev" => "السابق",
-"next" => "التالي"
+"next" => "التالي",
+"Security Warning!" => "تحذير أمان!",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "الرجاء التحقق من كلمة السر. <br/>من الممكن أحياناً أن نطلب منك إعادة إدخال كلمة السر مرة أخرى.",
+"Verify" => "تحقيق"
 );
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@ -33,7 +33,7 @@
 "The object type is not specified." => "No s'ha especificat el tipus d'objecte.",
 "Error" => "Error",
 "The app name is not specified." => "No s'ha especificat el nom de l'aplicació.",
-"The required file {file} is not installed!" => "El figtxer requerit {file} no està instal·lat!",
+"The required file {file} is not installed!" => "El fitxer requerit {file} no està instal·lat!",
 "Error while sharing" => "Error en compartir",
 "Error while unsharing" => "Error en deixar de compartir",
 "Error while changing permissions" => "Error en canviar els permisos",
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@ -1,15 +1,27 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Bruger %s delte en fil med dig",
+"User %s shared a folder with you" => "Bruger %s delte en mappe med dig",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Bruger %s delte filen \"%s\" med dig. Den kan hentes her: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Bruger %s delte mappe \"%s\" med dig. Det kan hentes her: %s",
+"Category type not provided." => "Kategori typen ikke er fastsat.",
 "No category to add?" => "Ingen kategori at tilføje?",
 "This category already exists: " => "Denne kategori eksisterer allerede: ",
+"Object type not provided." => "Object type ikke er fastsat.",
+"%s ID not provided." => "%s ID ikke oplyst.",
+"Error adding %s to favorites." => "Fejl ved tilføjelse af %s til favoritter.",
 "No categories selected for deletion." => "Ingen kategorier valgt",
+"Error removing %s from favorites." => "Fejl ved fjernelse af %s fra favoritter.",
 "Settings" => "Indstillinger",
 "seconds ago" => "sekunder siden",
 "1 minute ago" => "1 minut siden",
 "{minutes} minutes ago" => "{minutes} minutter siden",
+"1 hour ago" => "1 time siden",
+"{hours} hours ago" => "{hours} timer siden",
 "today" => "i dag",
 "yesterday" => "i går",
 "{days} days ago" => "{days} dage siden",
 "last month" => "sidste måned",
+"{months} months ago" => "{months} måneder siden",
 "months ago" => "måneder siden",
 "last year" => "sidste år",
 "years ago" => "år siden",
@ -18,7 +30,10 @@
 "No" => "Nej",
 "Yes" => "Ja",
 "Ok" => "OK",
+"The object type is not specified." => "Objekttypen er ikke angivet.",
 "Error" => "Fejl",
+"The app name is not specified." => "Den app navn er ikke angivet.",
+"The required file {file} is not installed!" => "Den krævede fil {file} er ikke installeret!",
 "Error while sharing" => "Fejl under deling",
 "Error while unsharing" => "Fejl under annullering af deling",
 "Error while changing permissions" => "Fejl under justering af rettigheder",
@ -28,6 +43,8 @@
 "Share with link" => "Del med link",
 "Password protect" => "Beskyt med adgangskode",
 "Password" => "Kodeord",
+"Email link to person" => "E-mail link til person",
+"Send" => "Send",
 "Set expiration date" => "Vælg udløbsdato",
 "Expiration date" => "Udløbsdato",
 "Share via email:" => "Del via email:",
@ -44,9 +61,13 @@
 "Password protected" => "Beskyttet med adgangskode",
 "Error unsetting expiration date" => "Fejl ved fjernelse af udløbsdato",
 "Error setting expiration date" => "Fejl under sætning af udløbsdato",
+"Sending ..." => "Sender ...",
+"Email sent" => "E-mail afsendt",
 "ownCloud password reset" => "Nulstil ownCloud kodeord",
 "Use the following link to reset your password: {link}" => "Anvend følgende link til at nulstille din adgangskode: {link}",
 "You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via email.",
+"Reset email send." => "Reset-mail afsendt.",
+"Request failed!" => "Anmodningen mislykkedes!",
 "Username" => "Brugernavn",
 "Request reset" => "Anmod om nulstilling",
 "Your password was reset" => "Dit kodeord blev nulstillet",
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Der Nutzer %s hat eine Datei für Dich freigegeben",
+"User %s shared a folder with you" => "%s hat ein Verzeichnis für Dich freigegeben",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat eine Datei \"%s\" für Dich freigegeben. Sie ist zum Download hier ferfügbar: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat eine Verzeichnis \"%s\" für Dich freigegeben. Es ist zum Download hier ferfügbar: %s",
 "Category type not provided." => "Kategorie nicht angegeben.",
 "No category to add?" => "Keine Kategorie hinzuzufügen?",
 "This category already exists: " => "Kategorie existiert bereits:",
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Der Nutzer %s teilt eine Datei mit dir",
-"User %s shared a folder with you" => "Der Nutzer %s teilt einen Ordner mit dir",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Der Nutzer %s teilt die Datei \"%s\" mit dir. Du kannst diese hier herunterladen: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Der Nutzer %s teilt den Ornder \"%s\" mit dir. Du kannst diesen hier herunterladen: %s",
+"User %s shared a file with you" => "Der Nutzer %s hat eine Datei für Sie freigegeben",
+"User %s shared a folder with you" => "%s hat ein Verzeichnis für Sie freigegeben",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat eine Datei \"%s\" für Sie freigegeben. Sie ist zum Download hier ferfügbar: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat eine Verzeichnis \"%s\" für Sie freigegeben. Es ist zum Download hier ferfügbar: %s",
 "Category type not provided." => "Kategorie nicht angegeben.",
 "No category to add?" => "Keine Kategorie hinzuzufügen?",
 "This category already exists: " => "Kategorie existiert bereits:",
@ -43,7 +43,7 @@
 "Share with link" => "Über einen Link freigeben",
 "Password protect" => "Passwortschutz",
 "Password" => "Passwort",
-"Email link to person" => "Link per Mail an Person schicken",
+"Email link to person" => "Link per E-Mail verschicken",
 "Send" => "Senden",
 "Set expiration date" => "Setze ein Ablaufdatum",
 "Expiration date" => "Ablaufdatum",
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Ο χρήστης %s διαμοιράστηκε ένα αρχείο με εσάς",
+"User %s shared a folder with you" => "Ο χρήστης %s διαμοιράστηκε ένα φάκελο με εσάς",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Ο χρήστης %s διαμοιράστηκε το αρχείο \"%s\" μαζί σας. Είναι διαθέσιμο για λήψη εδώ: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Ο χρήστης %s διαμοιράστηκε τον φάκελο \"%s\" μαζί σας. Είναι διαθέσιμος για λήψη εδώ: %s",
 "Category type not provided." => "Δεν δώθηκε τύπος κατηγορίας.",
 "No category to add?" => "Δεν έχετε κατηγορία να προσθέσετε;",
 "This category already exists: " => "Αυτή η κατηγορία υπάρχει ήδη:",
@ -39,6 +43,8 @@
 "Share with link" => "Διαμοιρασμός με σύνδεσμο",
 "Password protect" => "Προστασία συνθηματικού",
 "Password" => "Συνθηματικό",
+"Email link to person" => "Αποστολή συνδέσμου με email ",
+"Send" => "Αποστολή",
 "Set expiration date" => "Ορισμός ημ. λήξης",
 "Expiration date" => "Ημερομηνία λήξης",
 "Share via email:" => "Διαμοιρασμός μέσω email:",
@ -55,6 +61,8 @@
 "Password protected" => "Προστασία με συνθηματικό",
 "Error unsetting expiration date" => "Σφάλμα κατά την διαγραφή της ημ. λήξης",
 "Error setting expiration date" => "Σφάλμα κατά τον ορισμό ημ. λήξης",
+"Sending ..." => "Αποστολή...",
+"Email sent" => "Το Email απεστάλη ",
 "ownCloud password reset" => "Επαναφορά συνθηματικού ownCloud",
 "Use the following link to reset your password: {link}" => "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
 "You will receive a link to reset your password via Email." => "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "La uzanto %s kunhavigis dosieron kun vi",
+"User %s shared a folder with you" => "La uzanto %s kunhavigis dosierujon kun vi",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "La uzanto %s kunhavigis la dosieron “%s” kun vi. Ĝi elŝuteblas el tie ĉi: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "La uzanto %s kunhavigis la dosierujon “%s” kun vi. Ĝi elŝuteblas el tie ĉi: %s",
 "Category type not provided." => "Ne proviziĝis tipon de kategorio.",
 "No category to add?" => "Ĉu neniu kategorio estas aldonota?",
 "This category already exists: " => "Ĉi tiu kategorio jam ekzistas: ",
@ -39,6 +43,8 @@
 "Share with link" => "Kunhavigi per ligilo",
 "Password protect" => "Protekti per pasvorto",
 "Password" => "Pasvorto",
+"Email link to person" => "Retpoŝti la ligilon al ulo",
+"Send" => "Sendi",
 "Set expiration date" => "Agordi limdaton",
 "Expiration date" => "Limdato",
 "Share via email:" => "Kunhavigi per retpoŝto:",
@ -55,6 +61,8 @@
 "Password protected" => "Protektita per pasvorto",
 "Error unsetting expiration date" => "Eraro dum malagordado de limdato",
 "Error setting expiration date" => "Eraro dum agordado de limdato",
+"Sending ..." => "Sendante...",
+"Email sent" => "La retpoŝtaĵo sendiĝis",
 "ownCloud password reset" => "La pasvorto de ownCloud restariĝis.",
 "Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
 "You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "L'utilisateur %s a partagé un fichier avec vous",
+"User %s shared a folder with you" => "L'utilsateur %s a partagé un dossier avec vous",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "L'utilisateur %s a partagé le fichier \"%s\" avec vous. Vous pouvez le télécharger ici : %s",
 "Category type not provided." => "Type de catégorie non spécifié.",
 "No category to add?" => "Pas de catégorie à ajouter ?",
 "This category already exists: " => "Cette catégorie existe déjà : ",
@ -39,6 +42,8 @@
 "Share with link" => "Partager via lien",
 "Password protect" => "Protéger par un mot de passe",
 "Password" => "Mot de passe",
+"Email link to person" => "Envoyez le lien par email",
+"Send" => "Envoyer",
 "Set expiration date" => "Spécifier la date d'expiration",
 "Expiration date" => "Date d'expiration",
 "Share via email:" => "Partager via e-mail :",
@ -55,6 +60,8 @@
 "Password protected" => "Protégé par un mot de passe",
 "Error unsetting expiration date" => "Un erreur est survenue pendant la suppression de la date d'expiration",
 "Error setting expiration date" => "Erreur lors de la spécification de la date d'expiration",
+"Sending ..." => "En cours d'envoi ...",
+"Email sent" => "Email envoyé",
 "ownCloud password reset" => "Réinitialisation de votre mot de passe Owncloud",
 "Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
 "You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe.",
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "המשתמש %s שיתף אתך קובץ",
+"User %s shared a folder with you" => "המשתמש %s שיתף אתך תיקייה",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "המשתמש %s שיתף אתך את הקובץ „%s“. ניתן להוריד את הקובץ מכאן: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "המשתמש %s שיתף אתך את התיקייה „%s“. ניתן להוריד את התיקייה מכאן: %s",
 "Category type not provided." => "סוג הקטגוריה לא סופק.",
 "No category to add?" => "אין קטגוריה להוספה?",
 "This category already exists: " => "קטגוריה זאת כבר קיימת: ",
@ -39,6 +43,8 @@
 "Share with link" => "שיתוף עם קישור",
 "Password protect" => "הגנה בססמה",
 "Password" => "ססמה",
+"Email link to person" => "שליחת קישור בדוא״ל למשתמש",
+"Send" => "שליחה",
 "Set expiration date" => "הגדרת תאריך תפוגה",
 "Expiration date" => "תאריך התפוגה",
 "Share via email:" => "שיתוף באמצעות דוא״ל:",
@ -55,6 +61,8 @@
 "Password protected" => "מוגן בססמה",
 "Error unsetting expiration date" => "אירעה שגיאה בביטול תאריך התפוגה",
 "Error setting expiration date" => "אירעה שגיאה בעת הגדרת תאריך התפוגה",
+"Sending ..." => "מתבצעת שליחה ...",
+"Email sent" => "הודעת הדוא״ל נשלחה",
 "ownCloud password reset" => "איפוס הססמה של ownCloud",
 "Use the following link to reset your password: {link}" => "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
 "You will receive a link to reset your password via Email." => "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@ -1,18 +1,73 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Корисникот %s сподели датотека со Вас",
+"User %s shared a folder with you" => "Корисникот %s сподели папка со Вас",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Корисникот %s ја сподели датотека „%s“ со Вас. Достапна е за преземање тука: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Корисникот %s ја сподели папката „%s“ со Вас. Достапна е за преземање тука: %s",
+"Category type not provided." => "Не беше доставен тип на категорија.",
 "No category to add?" => "Нема категорија да се додаде?",
 "This category already exists: " => "Оваа категорија веќе постои:",
+"Object type not provided." => "Не беше доставен тип на објект.",
+"%s ID not provided." => "%s ID не беше доставено.",
+"Error adding %s to favorites." => "Грешка при додавање %s во омилени.",
 "No categories selected for deletion." => "Не е одбрана категорија за бришење.",
+"Error removing %s from favorites." => "Грешка при бришење на %s од омилени.",
 "Settings" => "Поставки",
+"seconds ago" => "пред секунди",
+"1 minute ago" => "пред 1 минута",
+"{minutes} minutes ago" => "пред {minutes} минути",
+"1 hour ago" => "пред 1 час",
+"{hours} hours ago" => "пред {hours} часови",
+"today" => "денеска",
+"yesterday" => "вчера",
+"{days} days ago" => "пред {days} денови",
+"last month" => "минатиот месец",
+"{months} months ago" => "пред {months} месеци",
+"months ago" => "пред месеци",
+"last year" => "минатата година",
+"years ago" => "пред години",
+"Choose" => "Избери",
 "Cancel" => "Откажи",
 "No" => "Не",
 "Yes" => "Да",
 "Ok" => "Во ред",
+"The object type is not specified." => "Не е специфициран типот на објект.",
 "Error" => "Грешка",
+"The app name is not specified." => "Името на апликацијата не е специфицирано.",
+"The required file {file} is not installed!" => "Задолжителната датотека {file} не е инсталирана!",
+"Error while sharing" => "Грешка при споделување",
+"Error while unsharing" => "Грешка при прекин на споделување",
+"Error while changing permissions" => "Грешка при промена на привилегии",
+"Shared with you and the group {group} by {owner}" => "Споделено со Вас и групата {group} од {owner}",
+"Shared with you by {owner}" => "Споделено со Вас од {owner}",
+"Share with" => "Сподели со",
+"Share with link" => "Сподели со врска",
+"Password protect" => "Заштити со лозинка",
 "Password" => "Лозинка",
+"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}" => "Споделено во {item} со {user}",
+"Unshare" => "Не споделувај",
+"can edit" => "може да се измени",
+"access control" => "контрола на пристап",
 "create" => "креирај",
+"update" => "ажурирај",
+"delete" => "избриши",
+"share" => "сподели",
+"Password protected" => "Заштитено со лозинка",
+"Error unsetting expiration date" => "Грешка при тргање на рокот на траење",
+"Error setting expiration date" => "Грешка при поставување на рок на траење",
+"Sending ..." => "Праќање...",
+"Email sent" => "Е-порака пратена",
 "ownCloud password reset" => "ресетирање на лозинка за ownCloud",
 "Use the following link to reset your password: {link}" => "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
 "You will receive a link to reset your password via Email." => "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
+"Reset email send." => "Порката за ресетирање на лозинка пратена.",
+"Request failed!" => "Барањето не успеа!",
 "Username" => "Корисничко име",
 "Request reset" => "Побарајте ресетирање",
 "Your password was reset" => "Вашата лозинка беше ресетирана",
@ -28,6 +83,10 @@
 "Cloud not found" => "Облакот не е најден",
 "Edit categories" => "Уреди категории",
 "Add" => "Додади",
+"Security Warning" => "Безбедносно предупредување",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Не е достапен безбеден генератор на случајни броеви, Ве молам озвоможете го OpenSSL PHP додатокот.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Без сигурен генератор на случајни броеви напаѓач може да ги предвиди жетоните за ресетирање на лозинка и да преземе контрола врз Вашата сметка. ",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Вашата папка со податоци и датотеките е најверојатно достапна од интернет. .htaccess датотеката што ја овозможува ownCloud не фунционира. Силно препорачуваме да го исконфигурирате вашиот сервер за вашата папка со податоци не е достапна преку интернетт или преместете ја надвор од коренот на веб серверот.",
 "Create an <strong>admin account</strong>" => "Направете <strong>администраторска сметка</strong>",
 "Advanced" => "Напредно",
 "Data folder" => "Фолдер со податоци",
@ -36,6 +95,7 @@
 "Database user" => "Корисник на база",
 "Database password" => "Лозинка на база",
 "Database name" => "Име на база",
+"Database tablespace" => "Табела во базата на податоци",
 "Database host" => "Сервер со база",
 "Finish setup" => "Заврши го подесувањето",
 "Sunday" => "Недела",
@ -59,10 +119,16 @@
 "December" => "Декември",
 "web services under your control" => "веб сервиси под Ваша контрола",
 "Log out" => "Одјава",
+"Automatic logon rejected!" => "Одбиена автоматска најава!",
+"If you did not change your password recently, your account may be compromised!" => "Ако не сте ја промениле лозинката во скоро време, вашата сметка може да е компромитирана",
+"Please change your password to secure your account again." => "Ве молам сменете ја лозинката да ја обезбедите вашата сметка повторно.",
 "Lost your password?" => "Ја заборавивте лозинката?",
 "remember" => "запамти",
 "Log in" => "Најава",
 "You are logged out." => "Одјавени сте.",
 "prev" => "претходно",
-"next" => "следно"
+"next" => "следно",
+"Security Warning!" => "Безбедносно предупредување.",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Ве молам потврдете ја вашата лозинка. <br />Од безбедносни причини од време на време може да биде побарано да ја внесете вашата лозинка повторно.",
+"Verify" => "Потврди"
 );
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Gebruiker %s deelde een bestand met u",
+"User %s shared a folder with you" => "Gebruiker %s deelde een map met u",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Gebruiker %s deelde bestand \"%s\" met u. Het is hier te downloaden: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Gebruiker %s deelde de map \"%s\" met u. De map is hier beschikbaar voor download: %s",
 "Category type not provided." => "Categorie type niet opgegeven.",
 "No category to add?" => "Geen categorie toevoegen?",
 "This category already exists: " => "Deze categorie bestaat al.",
@ -39,6 +43,8 @@
 "Share with link" => "Deel met link",
 "Password protect" => "Wachtwoord beveiliging",
 "Password" => "Wachtwoord",
+"Email link to person" => "E-mail link naar persoon",
+"Send" => "Versturen",
 "Set expiration date" => "Stel vervaldatum in",
 "Expiration date" => "Vervaldatum",
 "Share via email:" => "Deel via email:",
@ -55,6 +61,8 @@
 "Password protected" => "Wachtwoord beveiligd",
 "Error unsetting expiration date" => "Fout tijdens het verwijderen van de verval datum",
 "Error setting expiration date" => "Fout tijdens het instellen van de vervaldatum",
+"Sending ..." => "Versturen ...",
+"Email sent" => "E-mail verzonden",
 "ownCloud password reset" => "ownCloud wachtwoord herstellen",
 "Use the following link to reset your password: {link}" => "Gebruik de volgende link om je wachtwoord te resetten: {link}",
 "You will receive a link to reset your password via Email." => "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.",
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Użytkownik %s współdzieli plik z tobą",
+"User %s shared a folder with you" => "Uzytkownik %s wspóldzieli folder z toba",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Użytkownik %s współdzieli plik \"%s\" z tobą. Jest dostępny tutaj: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uzytkownik %s wspóldzieli folder \"%s\" z toba. Jest dostepny tutaj: %s",
 "Category type not provided." => "Typ kategorii nie podany.",
 "No category to add?" => "Brak kategorii",
 "This category already exists: " => "Ta kategoria już istnieje",
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "O utilizador %s partilhou um ficheiro consigo.",
+"User %s shared a folder with you" => "O utilizador %s partilhou uma pasta consigo.",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "O utilizador %s partilhou o ficheiro \"%s\" consigo. Está disponível para download aqui: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "O utilizador %s partilhou a pasta \"%s\" consigo. Está disponível para download aqui: %s",
 "Category type not provided." => "Tipo de categoria não fornecido",
 "No category to add?" => "Nenhuma categoria para adicionar?",
 "This category already exists: " => "Esta categoria já existe:",
@ -39,6 +43,8 @@
 "Share with link" => "Partilhar com link",
 "Password protect" => "Proteger com palavra-passe",
 "Password" => "Palavra chave",
+"Email link to person" => "Enviar o link por e-mail",
+"Send" => "Enviar",
 "Set expiration date" => "Especificar data de expiração",
 "Expiration date" => "Data de expiração",
 "Share via email:" => "Partilhar via email:",
@ -55,6 +61,8 @@
 "Password protected" => "Protegido com palavra-passe",
 "Error unsetting expiration date" => "Erro ao retirar a data de expiração",
 "Error setting expiration date" => "Erro ao aplicar a data de expiração",
+"Sending ..." => "A Enviar...",
+"Email sent" => "E-mail enviado com sucesso!",
 "ownCloud password reset" => "Reposição da password ownCloud",
 "Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {link}",
 "You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password",
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Пользователь %s открыл Вам доступ к файлу",
+"User %s shared a folder with you" => "Пользователь %s открыл Вам доступ к папке",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Пользователь %s открыл Вам доступ к файлу \"%s\". Он доступен для загрузки здесь: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Пользователь %s открыл Вам доступ к папке \"%s\". Она доступена для загрузки здесь: %s",
 "Category type not provided." => "Тип категории не предоставлен.",
 "No category to add?" => "Нет категории для добавления?",
 "This category already exists: " => "Эта категория уже существует:",
@ -39,6 +43,8 @@
 "Share with link" => "Опубликовать с ссылкой",
 "Password protect" => "Защитить паролем",
 "Password" => "Пароль",
+"Email link to person" => "Ссылка на адрес электронной почты",
+"Send" => "Отправить",
 "Set expiration date" => "Установить срок действия",
 "Expiration date" => "Дата истечения срока действия",
 "Share via email:" => "Сделать общедоступным посредством email:",
@ -55,6 +61,8 @@
 "Password protected" => "Пароль защищен",
 "Error unsetting expiration date" => "Ошибка при отключении даты истечения срока действия",
 "Error setting expiration date" => "Ошибка при установке даты истечения срока действия",
+"Sending ..." => "Отправка ...",
+"Email sent" => "Письмо отправлено",
 "ownCloud password reset" => "Переназначение пароля",
 "Use the following link to reset your password: {link}" => "Воспользуйтесь следующей ссылкой для переназначения пароля: {link}",
 "You will receive a link to reset your password via Email." => "Вы получите ссылку для восстановления пароля по электронной почте.",
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Uporanik %s je dal datoteko v souporabo z vami",
+"User %s shared a folder with you" => "Uporanik %s je dal mapo v souporabo z vami",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Uporanik %s je dal datoteko \"%s\" v souporabo z vami. Prenesete jo lahko tukaj: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uporanik %s je dal mapo \"%s\" v souporabo z vami. Prenesete je lahko tukaj: %s",
 "Category type not provided." => "Vrsta kategorije ni podana.",
 "No category to add?" => "Ni kategorije za dodajanje?",
 "This category already exists: " => "Ta kategorija že obstaja:",
@ -39,6 +43,8 @@
 "Share with link" => "Omogoči souporabo s povezavo",
 "Password protect" => "Zaščiti z geslom",
 "Password" => "Geslo",
+"Email link to person" => "Posreduj povezavo po e-pošti",
+"Send" => "Pošlji",
 "Set expiration date" => "Nastavi datum preteka",
 "Expiration date" => "Datum preteka",
 "Share via email:" => "Souporaba preko elektronske pošte:",
@ -55,6 +61,8 @@
 "Password protected" => "Zaščiteno z geslom",
 "Error unsetting expiration date" => "Napaka brisanja datuma preteka",
 "Error setting expiration date" => "Napaka med nastavljanjem datuma preteka",
+"Sending ..." => "Pošiljam ...",
+"Email sent" => "E-pošta je bila poslana",
 "ownCloud password reset" => "Ponastavitev gesla ownCloud",
 "Use the following link to reset your password: {link}" => "Uporabite naslednjo povezavo za ponastavitev gesla: {link}",
 "You will receive a link to reset your password via Email." => "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.",
--- a/Show more
+++ b/Show more